1 files changed, 24 insertions, 5 deletions
diff --git a/modules/buildsystem/templates/cleaner_test.rb b/modules/buildsystem/templates/cleaner_test.rb
index d1f343e2..7e03b80d 100644
--- a/modules/buildsystem/templates/cleaner_test.rb
+++ b/modules/buildsystem/templates/cleaner_test.rb
@@ -10,12 +10,18 @@ class TestCleaner < Test::Unit::TestCase
   end
 
   def packages(path)
-    @pkgs.map{|p| yield *p.split(":")}
+    @pkgs.map{|p|
+      l2 = p.split(':')
+      sourcerpm = l2[0]
+      filename = l2[1]
+      buildtime = l2[2].to_i
+      yield(sourcerpm, filename, buildtime)
+    }
   end
 
   def test_old
     # Package was built on this arch and src.rpm for new version is 15d old
-    setpackages(['foo-43-1.src.rpm:libfoo2-43-1.armv7hl.rpm', 'foo-42-1.src.rpm:libfoo1-42-1.armv7hl.rpm'])
+    setpackages(['foo-43-1.src.rpm:libfoo2-43-1.armv7hl.rpm:43', 'foo-42-1.src.rpm:libfoo1-42-1.armv7hl.rpm:42'])
     srcages = {}
     srcages['foo'] = [ 'foo-43-1.src.rpm', Time.now.to_i - 15*24*3600 ]
     srcs = {}
@@ -25,7 +31,7 @@ class TestCleaner < Test::Unit::TestCase
 
   def test_recent
     # Package was built on this arch but src.rpm for new version is only 1d old
-    setpackages(['foo-43-1.src.rpm:foo-43-1.armv7hl.rpm', 'foo-42-1.src.rpm:foo-42-1.armv7hl.rpm'])
+    setpackages(['foo-43-1.src.rpm:foo-43-1.armv7hl.rpm:43', 'foo-42-1.src.rpm:foo-42-1.armv7hl.rpm:42'])
     srcages = {}
     srcages['foo'] = [ 'foo-43.src.rpm', Time.now.to_i - 24*3600 ]
     srcs = {}
@@ -35,7 +41,7 @@ class TestCleaner < Test::Unit::TestCase
 
   def test_arm_late
     # Package was not yet built on this arch
-    setpackages(['foo-42-1.src.rpm:foo-42-1.armv7hl.rpm'])
+    setpackages(['foo-42-1.src.rpm:foo-42-1.armv7hl.rpm:42'])
     srcages = {}
     srcages['foo'] = [ 'foo-43.src.rpm', Time.now.to_i - 24*3600 ]
     srcs = {}
@@ -46,11 +52,24 @@ class TestCleaner < Test::Unit::TestCase
   def test_multiple_versions
     # Old package remains (usually happens to noarch due to youri bug)
     $noarch = { 'foo' => true }
-    setpackages(['foo-42-1.src.rpm:foo-42-1.noarch.rpm', 'foo-42-2.src.rpm:foo-42-2.noarch.rpm'])
+    setpackages(['foo-42-1.src.rpm:foo-42-1.noarch.rpm:42', 'foo-42-2.src.rpm:foo-42-2.noarch.rpm:43'])
     srcages = {}
     srcages['foo'] = [ 'foo-42-2.src.rpm', Time.now.to_i - 24*3600 ]
     srcs = {}
     srcs['foo-42-2.src.rpm'] = true
     assert_equal(['foo-42-1.noarch.rpm'], check_binaries(srcs, srcages, '', nil))
   end
+
+  def test_newer_binary
+    # Package built after src remains (could happen due to race condition with upload)
+    $noarch = { 'foo' => true }
+    srctime = Time.now.to_i - 10*24*3600
+    bintime = Time.now.to_i - 3600
+    setpackages(["foo-42-2.src.rpm:foo-42-2.noarch.rpm:#{bintime}"])
+    srcages = {}
+    srcages['foo'] = [ 'foo-42-1.src.rpm', srctime ]
+    srcs = {}
+    srcs['foo-42-1.src.rpm'] = true
+    assert_equal([], check_binaries(srcs, srcages, '', nil))
+  end
 end