From b14087d92f6c5d2430f97902e84d7f24027044bc Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 11 Oct 2016 10:43:36 +0200 Subject: perl_checker cleanups --- iurt | 2 +- lib/Iurt/Emi.pm | 2 +- t/emi_finisher.t | 8 ++++---- t/emi_mandatory.t | 12 ++++++------ t/emi_non_mandatory.t | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/iurt b/iurt index 49f49dc..085f3cc 100755 --- a/iurt +++ b/iurt @@ -938,7 +938,7 @@ retry: if (system("cp $chroot_tmp/home/$luser/rpmbuild/RPMS/*/*.rpm $local_spool &>/dev/null")) { # If copy fails (like disk full), report a failure and delete partially copied files plog('ERROR', "ERROR: could not copy rpm files from $chroot_tmp/home/$luser/rpmbuild/RPMS/ to $local_spool ($!)"); - for my $package (@packages) { + foreach my $package (@packages) { unlink "$local_spool/$package"; } } diff --git a/lib/Iurt/Emi.pm b/lib/Iurt/Emi.pm index a0ed76e..544a62a 100644 --- a/lib/Iurt/Emi.pm +++ b/lib/Iurt/Emi.pm @@ -77,7 +77,7 @@ sub find_prefixes_ready_to_upload { my $arch = $1; next if $arch eq 'src'; # If this is a secondary upload, noarch package will be dropped - next if ($arch eq 'noarch' && $pkg_tree{$prefix}{media}{$media}{uploaded}); + next if $arch eq 'noarch' && $pkg_tree{$prefix}{media}{$media}{uploaded}; $arches_to_upload{$arch} = 1; } diff --git a/t/emi_finisher.t b/t/emi_finisher.t index 8bfed63..c34ce2a 100644 --- a/t/emi_finisher.t +++ b/t/emi_finisher.t @@ -72,9 +72,9 @@ my %pkg_tree = ( my %targets = find_prefixes_ready_to_upload($config, %pkg_tree); -is($targets{'cauldron'}{'core/release'}{'arch_finisher'}{'i586'}, '20160113183431.nobody.valstar.23515'); -is($targets{'cauldron'}{'core/release'}{'arch_finisher'}{'x86_64'}, '20160113183431.nobody.valstar.23515'); -is($targets{'cauldron'}{'core/release'}{'arch_finisher'}{'armv5tl'}, '20160113183432.nobody.valstar.23515'); -ok(!$targets{'cauldron'}{'core/release'}{'arch_finisher'}{'noarch'}); +is($targets{cauldron}{'core/release'}{arch_finisher}{i586}, '20160113183431.nobody.valstar.23515'); +is($targets{cauldron}{'core/release'}{arch_finisher}{x86_64}, '20160113183431.nobody.valstar.23515'); +is($targets{cauldron}{'core/release'}{arch_finisher}{armv5tl}, '20160113183432.nobody.valstar.23515'); +ok(!$targets{cauldron}{'core/release'}{arch_finisher}{noarch}); done_testing(); diff --git a/t/emi_mandatory.t b/t/emi_mandatory.t index ce0a54b..49c3d0a 100644 --- a/t/emi_mandatory.t +++ b/t/emi_mandatory.t @@ -9,7 +9,7 @@ use Iurt::Emi; my $config = { mandatory_arch => ['i586', 'x86_64'] }; my %pkg_tree = ( '20160113183431.nobody.valstar.23515' => { - 'target' => 'cauldron', + 'target' => cauldron, 'media' => { 'core/release' => { 'done_arch' => { @@ -31,7 +31,7 @@ my %pkg_tree = ( ] }, '20160113183432.nobody.valstar.23515' => { - 'target' => 'cauldron', + 'target' => cauldron, 'media' => { 'core/release' => { 'done_arch' => { @@ -58,7 +58,7 @@ my %pkg_tree = ( ] }, '20160113183433.nobody.valstar.23515' => { - 'target' => 'cauldron', + 'target' => cauldron, 'media' => { 'core/release' => { 'done_arch' => { @@ -87,8 +87,8 @@ my %pkg_tree = ( my %targets = find_prefixes_ready_to_upload($config, %pkg_tree); # 20160113183431.nobody.valstar.23515 is not ready to upload, mandatory arch i586 is missing -ok(!('20160113183431.nobody.valstar.23515' ~~ @{$targets{'cauldron'}{'core/release'}{'to_upload'}}), 'mandatory architecture missing'); +ok(!('20160113183431.nobody.valstar.23515' ~~ @{$targets{cauldron}{'core/release'}{to_upload}}), 'mandatory architecture missing'); # 20160113183432.nobody.valstar.23515 is ready to upload, all arches are present -ok('20160113183432.nobody.valstar.23515' ~~ @{$targets{'cauldron'}{'core/release'}{'to_upload'}}, 'all mandatory architectures present'); +ok('20160113183432.nobody.valstar.23515' ~~ @{$targets{cauldron}{'core/release'}{to_upload}}, 'all mandatory architectures present'); # 20160113183433.nobody.valstar.23515 is ready to upload, i586 is excluded -ok('20160113183433.nobody.valstar.23515' ~~ @{$targets{'cauldron'}{'core/release'}{'to_upload'}}, 'mandatory architecture excluded'); +ok('20160113183433.nobody.valstar.23515' ~~ @{$targets{cauldron}{'core/release'}{to_upload}}, 'mandatory architecture excluded'); diff --git a/t/emi_non_mandatory.t b/t/emi_non_mandatory.t index 44031f6..d8f547c 100644 --- a/t/emi_non_mandatory.t +++ b/t/emi_non_mandatory.t @@ -212,7 +212,7 @@ my %expectations = ( my %targets = find_prefixes_ready_to_upload($config, %pkg_tree); foreach my $prefix (sort keys %expectations) { - my $ready = $prefix ~~ @{$targets{'cauldron'}{'core/release'}{'to_upload'}}; + my $ready = $prefix ~~ @{$targets{cauldron}{'core/release'}{to_upload}}; ok($expectations{$prefix}{ready} == $ready); next unless $expectations{$prefix}{ready}; @@ -232,7 +232,7 @@ foreach my $prefix (sort keys %expectations) { ok($all_uploaded); ok($all_unlinked); my $srpms_unlinked = @{$pkg_tree{$prefix}{srpms}} ~~ sub { - "./todo/cauldron/core/release/${prefix}_".@_[0] ~~ @unlinked + "./todo/cauldron/core/release/${prefix}_" . @_[0] ~~ @unlinked; }; ok($expectations{$prefix}{srpm_unlinked} == $srpms_unlinked); } -- cgit v1.2.1