Tests: resolver/test_autounmask: Remove test that don't test what they were supposed to

diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py
index 3740f831466af181e0345ed60c10c2f979263cb4..5d6d9d1235680a7e99e71f34ded92fdfcb1d0651 100644 (file)
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/pym/portage/tests/resolver/ResolverPlayground.py
@@ -203,6 +203,7 @@ class ResolverPlaygroundResult(object):
                self.depgraph = mydepgraph
                self.favorites = favorites
                self.mergelist = None
+               self.use_changes = self.depgraph._dynamic_config._needed_use_config_changes
 
                if self.depgraph._dynamic_config._serialized_tasks_cache is not None:
                        self.mergelist = []

diff --git a/pym/portage/tests/resolver/test_autounmask.py b/pym/portage/tests/resolver/test_autounmask.py
index 944e5485be9efac52c0ea69be58dffb42c0b558f..19d91484f09cc33ac4c05934e5401ceea06d3b07 100644 (file)
--- a/pym/portage/tests/resolver/test_autounmask.py
+++ b/pym/portage/tests/resolver/test_autounmask.py
@@ -35,14 +35,6 @@ class AutounmaskTestCase(TestCase):
                        "sci-libs/L-1": { "IUSE": "bar" },
                        "sci-libs/M-1": { "KEYWORDS": "~x86" },
                        "sci-libs/P-1": { },
-
-                       #ebuilds to conflicting use changes
-                       "net-www/G-1": { "DEPEND": "net-www/I[foo]", "EAPI": 2 },
-                       "net-www/H-1": { "DEPEND": "net-www/I[-foo]", "EAPI": 2 },
-                       "net-www/I-1": { "IUSE": "foo" },
-                       "net-www/J-1": { "DEPEND": "|| ( net-www/G net-www/H )" },
-                       "net-www/J-2": { "DEPEND": "|| ( net-www/H net-www/G )" },
-                       "net-www/K-1": { "DEPEND": "!!net-www/G", "EAPI": 2 },
                        }
 
                requests = (
@@ -104,20 +96,6 @@ class AutounmaskTestCase(TestCase):
                                        ["sci-libs/L-1", "sci-libs/K-7"]),
                                (["=sci-libs/K-8"], {"--autounmask": True}, None, False, \
                                        ["sci-libs/L-1", "sci-libs/K-8"]),
-                               
-                               #Testing conflict bahviour
-                               (["=net-www/G-1", "=net-www/H-1"], {"--autounmask": True}, None, False, None),
-                               #Some of the following tests don't work because we are not able to take back
-                               #changes that later on turn out to be not necessary, because the package
-                               #that induced the change gets masked.
-                               #~ (["=net-www/J-1", "=net-www/K-1"], {"--autounmask": True}, None, True, \
-                                       #~ ["net-www/I-1", "net-www/H-1", "net-www/J-1", "net-www/K-1"] ),
-                               (["=net-www/J-2", "=net-www/K-1"], {"--autounmask": True}, None, True, \
-                                       ["net-www/I-1", "net-www/K-1", "net-www/H-1", "net-www/J-2", ] ),
-                               #~ (["=net-www/K-1", "=net-www/J-1"], {"--autounmask": True}, None, True, \
-                                       #~ ["net-www/I-1", "net-www/H-1", "net-www/J-1", "net-www/K-1"] ),
-                               (["=net-www/K-1", "=net-www/J-2"], {"--autounmask": True}, None, True, \
-                                       ["net-www/I-1", "net-www/K-1", "net-www/H-1", "net-www/J-2", ] ),
                        )
 
                playground = ResolverPlayground(ebuilds=ebuilds)