diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-06-08 18:50:46 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-06-08 18:50:46 +0000 |
| commit | 34b0c13bce43796a09724d30eb90f2d6545d71d5 (patch) | |
| tree | 4522f0b369fbf186e94eff8f246bd83535988401 /t/superuser--handle-conflict-deps.t | |
| parent | 0a1719e9c340767641112ab79120cae41669f755 (diff) | |
| download | urpmi-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/superuser--handle-conflict-deps.t')
| -rw-r--r-- | t/superuser--handle-conflict-deps.t | 4 |
1 files changed, 2 insertions, 2 deletions
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'); |