aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem/templates/cleaner_test.rb
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2020-12-31 19:32:50 +0000
committerPascal Terjan <pterjan@mageia.org>2020-12-31 19:36:33 +0000
commit3d8c6dd1e3ae2f90ba6afe9931f4c2104edbed97 (patch)
tree792353a5792622642227ac1e3a25541c60a7ec08 /modules/buildsystem/templates/cleaner_test.rb
parent9e2728b289c71f062951ee78f6c515cc78c20908 (diff)
downloadpuppet-3d8c6dd1e3ae2f90ba6afe9931f4c2104edbed97.tar
puppet-3d8c6dd1e3ae2f90ba6afe9931f4c2104edbed97.tar.gz
puppet-3d8c6dd1e3ae2f90ba6afe9931f4c2104edbed97.tar.bz2
puppet-3d8c6dd1e3ae2f90ba6afe9931f4c2104edbed97.tar.xz
puppet-3d8c6dd1e3ae2f90ba6afe9931f4c2104edbed97.zip
Fix cleanup to correctly wait for 7d
It was checking if there is another version of the src, but using the name of the package instead of the name of the src, and those are usually different in the case we care most about (libraries).
Diffstat (limited to 'modules/buildsystem/templates/cleaner_test.rb')
-rw-r--r--modules/buildsystem/templates/cleaner_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/buildsystem/templates/cleaner_test.rb b/modules/buildsystem/templates/cleaner_test.rb
index 85d46a4b..b8b9ad84 100644
--- a/modules/buildsystem/templates/cleaner_test.rb
+++ b/modules/buildsystem/templates/cleaner_test.rb
@@ -15,12 +15,12 @@ class TestCleaner < Test::Unit::TestCase
def test_old
# Package was built on this arch and src.rpm for new version is 15d 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:libfoo2-43-1.armv7hl.rpm', 'foo-42-1.src.rpm:libfoo1-42-1.armv7hl.rpm'])
srcages = {}
srcages['foo'] = [ 'foo-43-1.src.rpm', Time.now.to_i - 15*24*3600 ]
srcs = {}
srcs['foo-43-1.src.rpm'] = true
- assert_equal(['foo-42-1.armv7hl.rpm'], check_binaries(srcs, srcages, '', nil))
+ assert_equal(['libfoo1-42-1.armv7hl.rpm'], check_binaries(srcs, srcages, '', nil))
end
def test_recent