diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-04-29 18:12:02 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-05-01 00:35:08 +0200 |
| commit | 378c25612aa4b202bf3b55182b9bab5a83890a02 (patch) | |
| tree | 9e04be05eecd73de466e8edd95d8bcfac8b4ab22 | |
| parent | 7446f94c052a40a5f21253b97a0fd36495ea7ed8 (diff) | |
| download | urpmi-378c25612aa4b202bf3b55182b9bab5a83890a02.tar urpmi-378c25612aa4b202bf3b55182b9bab5a83890a02.tar.gz urpmi-378c25612aa4b202bf3b55182b9bab5a83890a02.tar.bz2 urpmi-378c25612aa4b202bf3b55182b9bab5a83890a02.tar.xz urpmi-378c25612aa4b202bf3b55182b9bab5a83890a02.zip | |
fix running testsuite with rpm-4.9
Basically restoring commit 654ffaa9caf78556b9759c18345b5ec9207f3c43 for
older rpm
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | t/superuser--failing-scriptlets.t | 7 |
2 files changed, 7 insertions, 1 deletions
@@ -1,5 +1,6 @@ - cpan_testers: o do not skip network tests on pre-UsrMove distros (eg: Mageia 2) + o fix running testsuite with rpm-4.9 Version 8.122 - 28 April 2020 diff --git a/t/superuser--failing-scriptlets.t b/t/superuser--failing-scriptlets.t index 73adcada..dcd0b387 100644 --- a/t/superuser--failing-scriptlets.t +++ b/t/superuser--failing-scriptlets.t @@ -4,13 +4,18 @@ use strict; use lib '.', 't'; use helper; use Test::More 'no_plan'; +require urpm::select; my $medium_name = 'failing-scriptlets'; need_root_and_prepare(); test_install_rpm_fail('pre'); -test_install_rpm_fail('pretrans'); +if (urpm::select::_rpm_version() lt 4.10.0) { + test_install_rpm('pretrans'); +} else { + test_install_rpm_fail('pretrans'); +} test_install_rpm('post'); require urpm::select; if (urpm::select::_rpm_version() lt 4.13.0 && -e '/etc/mageia-release') { |