summaryrefslogtreecommitdiffstats
path: root/pym/portage/tests
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-10-26 00:43:20 -0700
committerZac Medico <zmedico@gentoo.org>2012-10-26 00:43:20 -0700
commit222dfa56e8fb311f4bea54012bdfd5d1a474d56c (patch)
treed393e941291ceaf2595ef68948734ff35a3ef596 /pym/portage/tests
parent287636c98ca6841601372d32fb7c66ffdad9eaae (diff)
downloadportage-222dfa56e8fb311f4bea54012bdfd5d1a474d56c.tar.gz
portage-222dfa56e8fb311f4bea54012bdfd5d1a474d56c.tar.bz2
portage-222dfa56e8fb311f4bea54012bdfd5d1a474d56c.zip
backtracking: discard extra rebuilds, bug #439688
Diffstat (limited to 'pym/portage/tests')
-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 = []),
)