From 714d7bde3a2244dbfc6e83305d6e586555d2339f Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 4 Aug 2015 04:26:36 -0400 Subject: install sh as dep for failing-scriplets pkgs --- t/superuser--failing-scriptlets.t | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 't/superuser--failing-scriptlets.t') diff --git a/t/superuser--failing-scriptlets.t b/t/superuser--failing-scriptlets.t index be838c7b..186e182f 100644 --- a/t/superuser--failing-scriptlets.t +++ b/t/superuser--failing-scriptlets.t @@ -27,8 +27,9 @@ test_install_upgrade_rpm('triggerpostun'); sub test_install_rpm { my ($name) = @_; + test_install_rpm_no_remove('sh'); system_("rpm --root $::pwd/root -i media/$medium_name/$name-*.rpm"); - check_installed_fullnames_and_remove("$name-1-1"); + check_installed_fullnames_and_remove("$name-1-1", "sh-1-1"); } sub test_install_rpm_no_remove { my ($name) = @_; @@ -37,15 +38,17 @@ sub test_install_rpm_no_remove { } sub test_install_rpm_fail { my ($name) = @_; + test_install_rpm_no_remove('sh'); system_should_fail("rpm --root $::pwd/root -i media/$medium_name/$name-*.rpm"); - check_nothing_installed(); + check_installed_fullnames_and_remove("sh-1-1"); } sub test_install_upgrade_rpm { my ($name) = @_; + test_install_rpm_no_remove('sh'); system_("rpm --root $::pwd/root -i media/$medium_name/$name-1-*.rpm"); - check_installed_fullnames("$name-1-1"); + check_installed_fullnames("$name-1-1", "sh-1-1"); system_("rpm --root $::pwd/root -U media/$medium_name/$name-2-*.rpm"); - check_installed_fullnames_and_remove("$name-2-1"); + check_installed_fullnames_and_remove("$name-2-1", "sh-1-1"); } -- cgit v1.2.1