diff options
Diffstat (limited to 't')
| -rw-r--r-- | t/superuser--handle-conflict-deps.t | 4 | ||||
| -rw-r--r-- | t/superuser--handle-conflict-deps2.t | 4 |
2 files changed, 4 insertions, 4 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 { 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 { |