diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-01-15 00:59:14 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-01-17 02:22:39 +0100 |
| commit | 46387084f6d0e09207354daed3fe2531035d638d (patch) | |
| tree | 3c9eced401f93afe20f9e4778e32694ae70c6795 /t/superuser--priority-upgrade.t | |
| parent | bd9042d1252f276d1d57fb172c2cb3e1b6847c10 (diff) | |
| download | urpmi-46387084f6d0e09207354daed3fe2531035d638d.tar urpmi-46387084f6d0e09207354daed3fe2531035d638d.tar.gz urpmi-46387084f6d0e09207354daed3fe2531035d638d.tar.bz2 urpmi-46387084f6d0e09207354daed3fe2531035d638d.tar.xz urpmi-46387084f6d0e09207354daed3fe2531035d638d.zip | |
fix testsuite errors on CentOs (NVR vs NVRA)
where rpmquery default to outputing NVRA (vs NVR on Mageia)
reuse check_installed_fullnames() where needed instead of introducing %{NVR}
Diffstat (limited to 't/superuser--priority-upgrade.t')
| -rw-r--r-- | t/superuser--priority-upgrade.t | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/superuser--priority-upgrade.t b/t/superuser--priority-upgrade.t index 9bf9387b..26252f00 100644 --- a/t/superuser--priority-upgrade.t +++ b/t/superuser--priority-upgrade.t @@ -62,7 +62,7 @@ sub test { urpmi($pkgs_v1); my @pkgs_v1 = split(' ', $pkgs_v1); - is(`rpm -qa --root $::pwd/root | sort`, join('', map { "$_-1-1\n" } @pkgs_v1)); + check_installed_fullnames(map { "$_-1-1" } @pkgs_v1); unlink "$::pwd/media/$name"; symlink "$name-2", "$::pwd/media/$name"; @@ -77,10 +77,10 @@ sub test { my @pkgs_v2 = split(' ', $pkgs_v2); my @l = ( - (map { "$_-2-1\n" } @pkgs_v2), - (map { "$_-1-1\n" } difference2(\@pkgs_v1, \@pkgs_v2)), + (map { "$_-2-1" } @pkgs_v2), + (map { "$_-1-1" } difference2(\@pkgs_v1, \@pkgs_v2)), ); - is(`rpm -qa --root $::pwd/root | sort`, join('', sort @l)); + check_installed_fullnames(sort @l); system_('rm -rf root'); } |