summaryrefslogtreecommitdiffstats
path: root/t
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-06-08 18:50:46 +0000
committerThierry Vignaud <tv@mageia.org>2012-06-08 18:50:46 +0000
commit34b0c13bce43796a09724d30eb90f2d6545d71d5 (patch)
tree4522f0b369fbf186e94eff8f246bd83535988401 /t
parent0a1719e9c340767641112ab79120cae41669f755 (diff)
downloadurpmi-34b0c13bce43796a09724d30eb90f2d6545d71d5.tar
urpmi-34b0c13bce43796a09724d30eb90f2d6545d71d5.tar.gz
urpmi-34b0c13bce43796a09724d30eb90f2d6545d71d5.tar.bz2
urpmi-34b0c13bce43796a09724d30eb90f2d6545d71d5.tar.xz
urpmi-34b0c13bce43796a09724d30eb90f2d6545d71d5.zip
fix testsuite faillure introduced in commit r3103 on Feb 27 2012:
"fix urpmi failing silently and with exit status 0 when package installation fails due to either conflicts (mdv#63072) or to unselecting package (inspirated by mdv, mdv#63940)" urpmi now exit with 17 instead of 0 in that case unless we comment "$exit_code ||= $urpm::postponed_code;" in urpmi
Diffstat (limited to 't')
-rw-r--r--t/superuser--failing-promotion.t2
-rw-r--r--t/superuser--handle-conflict-deps.t4
-rw-r--r--t/superuser--handle-conflict-deps2.t2
3 files changed, 4 insertions, 4 deletions
diff --git a/t/superuser--failing-promotion.t b/t/superuser--failing-promotion.t
index aaa80f26..64f5b258 100644
--- a/t/superuser--failing-promotion.t
+++ b/t/superuser--failing-promotion.t
@@ -43,7 +43,7 @@ urpmi_addmedia("$name $::pwd/media/$name");
# bug #50666
urpmi("--auto a-1 c-1 b-1");
check_installed_fullnames("a-1-1", "c-1-1", "b-1-1");
-urpmi("--auto a");
+urpmi_partial("--auto a");
check_installed_fullnames_and_remove("a-2-1");
# bug #57224
diff --git a/t/superuser--handle-conflict-deps.t b/t/superuser--handle-conflict-deps.t
index e5c45a3e..5a372cba 100644
--- a/t/superuser--handle-conflict-deps.t
+++ b/t/superuser--handle-conflict-deps.t
@@ -38,7 +38,7 @@ sub test_conflict_on_upgrade {
}
sub test_conflict_on_install {
- urpmi('--auto a b');
+ urpmi_partial('--auto a b');
# either a or b is chosen, depending on hdlist order; both are valid
if (system("rpm -q --quiet --root $::pwd/root a") == 0) {
check_installed_and_remove('a');
@@ -46,7 +46,7 @@ sub test_conflict_on_install {
check_installed_and_remove('b', 'b-sub');
}
- urpmi('--auto f g'); # test for bug #52135
+ urpmi_partial('--auto f g'); # test for bug #52135
# either f or g is chosen, depending on hdlist order; both are valid
if (system("rpm -q --quiet --root $::pwd/root f") == 0) {
check_installed_and_remove('f');
diff --git a/t/superuser--handle-conflict-deps2.t b/t/superuser--handle-conflict-deps2.t
index a68ba195..5894e1b4 100644
--- a/t/superuser--handle-conflict-deps2.t
+++ b/t/superuser--handle-conflict-deps2.t
@@ -38,7 +38,7 @@ sub test {
system_should_fail("echo n | " . urpmi_cmd() . " @$wanted");
check_installed_fullnames(map { "$_-1" } @$first);
- urpmi("--auto @$wanted");
+ urpmi_partial("--auto @$wanted");
if (system("rpm -q --quiet --root $::pwd/root ".@$result1[0]) == 0) {
check_installed_fullnames_and_remove(map { "$_-1" } @$result1);