diff options
| author | Christophe Fergeau <cfergeau@mandriva.com> | 2010-01-12 14:09:12 +0000 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@mandriva.com> | 2010-01-12 14:09:12 +0000 |
| commit | 46d17b0b3d673e176ec8d5d72c1a678d131195f9 (patch) | |
| tree | 756833832d30e9b9a108e89077e6ce603df8cea5 /t/superuser--handle-conflict-deps.t | |
| parent | ab9e35b10cb34ca36314c5658f4a71f11642fb47 (diff) | |
| download | urpmi-46d17b0b3d673e176ec8d5d72c1a678d131195f9.tar urpmi-46d17b0b3d673e176ec8d5d72c1a678d131195f9.tar.gz urpmi-46d17b0b3d673e176ec8d5d72c1a678d131195f9.tar.bz2 urpmi-46d17b0b3d673e176ec8d5d72c1a678d131195f9.tar.xz urpmi-46d17b0b3d673e176ec8d5d72c1a678d131195f9.zip | |
adjust expected test results
These tests have 2 valid outputs depending on which order the packages
are picked by urpmi, seems this order changed, so we have to adjust the
expected results
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 6d349cbd..24197604 100644 --- a/t/superuser--handle-conflict-deps.t +++ b/t/superuser--handle-conflict-deps.t @@ -39,10 +39,10 @@ sub test_conflict_on_upgrade { sub test_conflict_on_install { urpmi('--auto a b'); - check_installed_and_remove('a'); # WARNING: either a or b is chosen, depending on hdlist order + check_installed_and_remove('b', 'b-sub'); # WARNING: either a or b is chosen, depending on hdlist order urpmi('--auto f g'); # test for bug #52135 - check_installed_and_remove('g'); + check_installed_and_remove('f'); } sub test_simple { |