diff options
| -rw-r--r-- | pym/portage/tests/resolver/test_circular_dependencies.py | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/pym/portage/tests/resolver/test_circular_dependencies.py b/pym/portage/tests/resolver/test_circular_dependencies.py index e70298642..6eca63ea7 100644 --- a/pym/portage/tests/resolver/test_circular_dependencies.py +++ b/pym/portage/tests/resolver/test_circular_dependencies.py @@ -16,6 +16,9 @@ class CircularDependencyTestCase(TestCase): def testCircularDependency(self): + + EAPI_4 = '4_pre1' + ebuilds = { "dev-libs/Z-1": { "DEPEND": "foo? ( !bar? ( dev-libs/Y ) )", "IUSE": "+foo bar", "EAPI": 1 }, "dev-libs/Z-2": { "DEPEND": "foo? ( dev-libs/Y ) !bar? ( dev-libs/Y )", "IUSE": "+foo bar", "EAPI": 1 }, @@ -25,10 +28,10 @@ class CircularDependencyTestCase(TestCase): "dev-libs/W-2": { "DEPEND": "dev-libs/Z[foo=] dev-libs/Y", "IUSE": "+foo", "EAPI": 2 }, "dev-libs/W-3": { "DEPEND": "dev-libs/Z[bar] dev-libs/Y", "EAPI": 2 }, - #~ "app-misc/A-1": { "DEPEND": "foo? ( =app-misc/B-1 )", "IUSE": "+foo bar", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": 4 }, - #~ "app-misc/A-2": { "DEPEND": "foo? ( =app-misc/B-2 ) bar? ( =app-misc/B-2 )", "IUSE": "+foo bar", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": 4 }, - #~ "app-misc/B-1": { "DEPEND": "=app-misc/A-1" }, - #~ "app-misc/B-2": { "DEPEND": "=app-misc/A-2" }, + "app-misc/A-1": { "DEPEND": "foo? ( =app-misc/B-1 )", "IUSE": "+foo bar", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": EAPI_4 }, + "app-misc/A-2": { "DEPEND": "foo? ( =app-misc/B-2 ) bar? ( =app-misc/B-2 )", "IUSE": "+foo bar", "REQUIRED_USE": "^^ ( foo bar )", "EAPI": EAPI_4 }, + "app-misc/B-1": { "DEPEND": "=app-misc/A-1" }, + "app-misc/B-2": { "DEPEND": "=app-misc/A-2" }, } test_cases = ( @@ -65,14 +68,14 @@ class CircularDependencyTestCase(TestCase): success = False), #Conflict with REQUIRED_USE - #~ ResolverPlaygroundTestCase( - #~ ["=app-misc/B-1"], - #~ circular_dependency_solutions = { "app-misc/B-1": frozenset([frozenset([("foo", False), ("bar", True)])])}, - #~ success = False), - #~ ResolverPlaygroundTestCase( - #~ ["=app-misc/B-2"], - #~ circular_dependency_solutions = {}, - #~ success = False), + ResolverPlaygroundTestCase( + ["=app-misc/B-1"], + circular_dependency_solutions = { "app-misc/B-1": frozenset([frozenset([("foo", False), ("bar", True)])])}, + success = False), + ResolverPlaygroundTestCase( + ["=app-misc/B-2"], + circular_dependency_solutions = {}, + success = False), ) playground = ResolverPlayground(ebuilds=ebuilds) |