aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/portage/tests/resolver/test_or_choices.py')
-rw-r--r--lib/portage/tests/resolver/test_or_choices.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/portage/tests/resolver/test_or_choices.py b/lib/portage/tests/resolver/test_or_choices.py
index c0316bfb3..a50ad0151 100644
--- a/lib/portage/tests/resolver/test_or_choices.py
+++ b/lib/portage/tests/resolver/test_or_choices.py
@@ -288,6 +288,15 @@ class OrChoicesTestCase(TestCase):
class OrChoicesLibpostprocTestCase(TestCase):
def testOrChoicesLibpostproc(self):
+ # This test case is expected to fail after the fix for bug 706278,
+ # since the "undesirable" slot upgrade which triggers a blocker conflict
+ # in this test case is practically indistinguishable from a desirable
+ # slot upgrade. This particular blocker conflict is no longer relevant,
+ # since current versions of media-libs/libpostproc are no longer
+ # compatible with any available media-video/ffmpeg slot. In order to
+ # solve this test case, some fancy backtracking (like for bug 382421)
+ # will be required.
+ self.todo = True
ebuilds = {
"media-video/ffmpeg-0.10" : {