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-deps2.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-deps2.t')
| -rw-r--r-- | t/superuser--handle-conflict-deps2.t | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/superuser--handle-conflict-deps2.t b/t/superuser--handle-conflict-deps2.t index a59c35f7..f192faee 100644 --- a/t/superuser--handle-conflict-deps2.t +++ b/t/superuser--handle-conflict-deps2.t @@ -24,10 +24,10 @@ urpmi_addmedia("$name $::pwd/media/$name"); # 'c-2','d2-2' is also a valid result; both wanted pkgs can't be installed, # so urpmi can arbitrarily drop one (after confirming with user, of course) -test(['d1-1', 'c-1'], ['c-2', 'd1-2'], ['c-1', 'd1-2']); +test(['d1-1', 'c-1'], ['c-2', 'd1-2'], ['c-2', 'd2-2']); # 'a1-2','b-1' is also a valid result -test(['a1-1', 'b-1'], ['b-2', 'a1-2'], ['b-2', 'a2-2']); +test(['a1-1', 'b-1'], ['b-2', 'a1-2'], ['b-1', 'a1-2']); sub test { |