diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | t/helper.pm | 4 | ||||
| -rw-r--r-- | t/superuser--file-conflicts.t | 2 | ||||
| -rw-r--r-- | t/superuser--rpmnew.t | 2 |
4 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,5 @@ +- adapt testsuite to rpm-4.14.0~rc1 + Version 8.112 - 14 June 2018 - cpan testers: diff --git a/t/helper.pm b/t/helper.pm index e1ae6655..40324133 100644 --- a/t/helper.pm +++ b/t/helper.pm @@ -23,7 +23,9 @@ sub need_root_and_prepare() { system('rm -rf root'); isnt(-d 'root', "test root dir can not be removed $!"); - mkdir 'root'; + system('mkdir -p root/etc/rpm'); + system('echo "%_pkgverify_level none" >root/etc/rpm/macros'); + # system('echo "%_pkgverify_flags 0x0" >> root/etc/rpm/macros'); $using_root = 1; $ENV{LC_ALL} = 'C'; } diff --git a/t/superuser--file-conflicts.t b/t/superuser--file-conflicts.t index 941eb669..6528d2c2 100644 --- a/t/superuser--file-conflicts.t +++ b/t/superuser--file-conflicts.t @@ -184,7 +184,7 @@ sub test_rpm_i_fail { system_should_fail("rpm --root $::pwd/root -i $rpms"); } sub check_no_etc_files() { - if (my @l = grep { !m!/urpmi$! } glob("$::pwd/root/etc/*")) { + if (my @l = grep { !m!/urpmi|rpm$! } glob("$::pwd/root/etc/*")) { fail(join(' ', @l) . " files should not be there"); } } diff --git a/t/superuser--rpmnew.t b/t/superuser--rpmnew.t index d82f45f7..80a492c7 100644 --- a/t/superuser--rpmnew.t +++ b/t/superuser--rpmnew.t @@ -68,7 +68,7 @@ sub test3 { } sub check_no_etc_files() { - if (my @l = grep { !m!/urpmi$! } glob("$::pwd/root/etc/*")) { + if (my @l = grep { !m!/urpmi|rpm$! } glob("$::pwd/root/etc/*")) { fail(join(' ', @l) . " files should not be there"); } } |