diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-01-17 03:54:32 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-04-09 17:50:35 +0200 |
| commit | b870c2c387e563b5b8354420ffd9aa0b386dcf07 (patch) | |
| tree | af3de79a5645b214d32e4e28c461053da1c779d8 /t/superuser--obsolete-and-conflict.t | |
| parent | 2b9a098752bdf9b5a8a33b852c26f4b78bd077c5 (diff) | |
| download | urpmi-b870c2c387e563b5b8354420ffd9aa0b386dcf07.tar urpmi-b870c2c387e563b5b8354420ffd9aa0b386dcf07.tar.gz urpmi-b870c2c387e563b5b8354420ffd9aa0b386dcf07.tar.bz2 urpmi-b870c2c387e563b5b8354420ffd9aa0b386dcf07.tar.xz urpmi-b870c2c387e563b5b8354420ffd9aa0b386dcf07.zip | |
cpan_testers: fix a test with rpm < 4.13.0
It was failing for older versions of rpm since
commit 32c4bc874e3f7fc99188bf045902b1018f38855a
This fix the counting & adjust to missing pkg name when erasing with
older rpms
Diffstat (limited to 't/superuser--obsolete-and-conflict.t')
| -rw-r--r-- | t/superuser--obsolete-and-conflict.t | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/t/superuser--obsolete-and-conflict.t b/t/superuser--obsolete-and-conflict.t index 5284618d..ab469b32 100644 --- a/t/superuser--obsolete-and-conflict.t +++ b/t/superuser--obsolete-and-conflict.t @@ -9,6 +9,7 @@ use strict; use lib '.', 't'; use helper; +use urpm::select; use urpm::util; use urpm::cfg; use Test::More 'no_plan'; @@ -30,11 +31,12 @@ sub test1 { check_installed_names('a'); my $arch = urpm::cfg::get_arch(); - test_urpmi("b c", sprintf(<<'EOF', $arch, $arch)); + my $rm_msg = urpm::select::_rpm_version() gt 4.13.0 ? " a-1-1.$arch" : ""; + test_urpmi("b c", sprintf(<<'EOF', $rm_msg || ' ', $rm_msg)); 1/2: c 2/2: b -removing package a-1-1.%s - 1/1: removing a-1-1.%s +removing package%s + 1/1: removing%s EOF check_installed_and_remove('b', 'c'); } |