summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-08-04 03:58:03 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-08-04 18:00:35 +0200
commit654ffaa9caf78556b9759c18345b5ec9207f3c43 (patch)
treef588e881bfc7437f86a0ab9723bd9d8b1d39369b
parent1e0eb1139e125f6009949fd61d5088d5cc9084db (diff)
downloadurpmi-654ffaa9caf78556b9759c18345b5ec9207f3c43.tar
urpmi-654ffaa9caf78556b9759c18345b5ec9207f3c43.tar.gz
urpmi-654ffaa9caf78556b9759c18345b5ec9207f3c43.tar.bz2
urpmi-654ffaa9caf78556b9759c18345b5ec9207f3c43.tar.xz
urpmi-654ffaa9caf78556b9759c18345b5ec9207f3c43.zip
do check that %%pretrans do fail (rpm-4.10+)
basically reverting commit 5d7414cd5dc0c7dbdfe5314df4253cb14f86e9b2 and inversing the test expected result needs rpm-4.12.90-2.mga6 or newer
-rw-r--r--NEWS1
-rw-r--r--t/superuser--failing-scriptlets.t6
2 files changed, 2 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 7c6adb44..d05c4137 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
o misc enhancements & cleanups
o fix tests for ignored faillure for %pre{,un}, %pretrans
(was ignored since rpm-4.9.0)
+ o test that %pretrans do fail installtion (needs rpm-4.13)
Version 8.05 - 18 March 2015
diff --git a/t/superuser--failing-scriptlets.t b/t/superuser--failing-scriptlets.t
index 186e182f..1f0f733f 100644
--- a/t/superuser--failing-scriptlets.t
+++ b/t/superuser--failing-scriptlets.t
@@ -4,17 +4,13 @@ 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');
-#%pretrans scriptlet failure now fails the install of the package (similarly to %pre and %preun semantics):
-if (urpm::select::_rpm_version() lt 4.10.0) {
- test_install_rpm('pretrans');
-}
+test_install_rpm_fail('pretrans');
test_install_rpm('post');
test_install_rpm('preun');
test_install_rpm('postun');