summaryrefslogtreecommitdiffstats
path: root/pym/portage/tests/resolver/test_slot_conflict_rebuild.py
diff options
context:
space:
mode:
Diffstat (limited to 'pym/portage/tests/resolver/test_slot_conflict_rebuild.py')
-rw-r--r--pym/portage/tests/resolver/test_slot_conflict_rebuild.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/tests/resolver/test_slot_conflict_rebuild.py b/pym/portage/tests/resolver/test_slot_conflict_rebuild.py
index e255e2a53..5ce2329e1 100644
--- a/pym/portage/tests/resolver/test_slot_conflict_rebuild.py
+++ b/pym/portage/tests/resolver/test_slot_conflict_rebuild.py
@@ -60,13 +60,13 @@ class SlotConflictRebuildTestCase(TestCase):
test_cases = (
- # Demonstrate bug #439688, where a slot conflict prevents
- # an upgrade and triggers unnecessary rebuilds.
+ # Test bug #439688, where a slot conflict prevents an
+ # upgrade and we don't want to trigger unnecessary rebuilds.
ResolverPlaygroundTestCase(
["@world"],
options = {"--update": True, "--deep": True},
success = True,
- mergelist = ["app-misc/A-1", "app-misc/B-0"]),
+ mergelist = []),
)