From e79eef3a6e7dec8ef39927f98ecfbc63e755f540 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 21 Oct 2010 12:47:19 -0700 Subject: [PATCH] Enable tests for use dep defaults. --- .../tests/resolver/test_use_dep_defaults.py | 66 ++++++++++--------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/pym/portage/tests/resolver/test_use_dep_defaults.py b/pym/portage/tests/resolver/test_use_dep_defaults.py index 0ddcd3836..bc7bc25cc 100644 --- a/pym/portage/tests/resolver/test_use_dep_defaults.py +++ b/pym/portage/tests/resolver/test_use_dep_defaults.py @@ -2,39 +2,41 @@ # Distributed under the terms of the GNU General Public License v2 from portage.tests import TestCase -#from portage.tests.resolver.ResolverPlayground import ResolverPlayground, ResolverPlaygroundTestCase +from portage.tests.resolver.ResolverPlayground import ResolverPlayground, ResolverPlaygroundTestCase class UseDepDefaultsTestCase(TestCase): def testUseDepDefaultse(self): - pass - #~ ebuilds = { - #~ "dev-libs/A-1": { "DEPEND": "dev-libs/B[foo]", "RDEPEND": "dev-libs/B[foo]", "EAPI": 2 }, - #~ "dev-libs/A-2": { "DEPEND": "dev-libs/B[foo(+)]", "RDEPEND": "dev-libs/B[foo(+)]", "EAPI": 4 }, - #~ "dev-libs/A-3": { "DEPEND": "dev-libs/B[foo(-)]", "RDEPEND": "dev-libs/B[foo(-)]", "EAPI": 4 }, - #~ "dev-libs/B-1": { "IUSE": "+foo", "EAPI": 1 }, - #~ "dev-libs/B-2": {}, - #~ } -#~ - #~ test_cases = ( - #~ ResolverPlaygroundTestCase( - #~ ["=dev-libs/A-1"], - #~ success = True, - #~ mergelist = ["dev-libs/B-1", "dev-libs/A-1"]), - #~ ResolverPlaygroundTestCase( - #~ ["=dev-libs/A-2"], - #~ success = True, - #~ mergelist = ["dev-libs/B-2", "dev-libs/A-2"]), - #~ ResolverPlaygroundTestCase( - #~ ["=dev-libs/A-3"], - #~ success = True, - #~ mergelist = ["dev-libs/B-1", "dev-libs/A-3"]), - #~ ) -#~ - #~ playground = ResolverPlayground(ebuilds=ebuilds) - #~ try: - #~ for test_case in test_cases: - #~ playground.run_TestCase(test_case) - #~ self.assertEqual(test_case.test_success, True, test_case.fail_msg) - #~ finally: - #~ playground.cleanup() + + EAPI_4 = '4_pre1' + + ebuilds = { + "dev-libs/A-1": { "DEPEND": "dev-libs/B[foo]", "RDEPEND": "dev-libs/B[foo]", "EAPI": "2" }, + "dev-libs/A-2": { "DEPEND": "dev-libs/B[foo(+)]", "RDEPEND": "dev-libs/B[foo(+)]", "EAPI": EAPI_4 }, + "dev-libs/A-3": { "DEPEND": "dev-libs/B[foo(-)]", "RDEPEND": "dev-libs/B[foo(-)]", "EAPI": EAPI_4 }, + "dev-libs/B-1": { "IUSE": "+foo", "EAPI": "1" }, + "dev-libs/B-2": {}, + } + + test_cases = ( + ResolverPlaygroundTestCase( + ["=dev-libs/A-1"], + success = True, + mergelist = ["dev-libs/B-1", "dev-libs/A-1"]), + ResolverPlaygroundTestCase( + ["=dev-libs/A-2"], + success = True, + mergelist = ["dev-libs/B-2", "dev-libs/A-2"]), + ResolverPlaygroundTestCase( + ["=dev-libs/A-3"], + success = True, + mergelist = ["dev-libs/B-1", "dev-libs/A-3"]), + ) + + playground = ResolverPlayground(ebuilds=ebuilds) + try: + for test_case in test_cases: + playground.run_TestCase(test_case) + self.assertEqual(test_case.test_success, True, test_case.fail_msg) + finally: + playground.cleanup() -- 2.26.2