diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-08-07 10:07:38 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-07 18:48:59 -0700 |
| commit | 44ade54c617432cc8836e5bf862705c347410cc9 (patch) | |
| tree | df48aa227b9702058804e0d48092981248502ea0 | |
| parent | 23225a062ac87a53c1a206a0c1978698458f7ce4 (diff) | |
| download | portage-44ade54c617432cc8836e5bf862705c347410cc9.tar.gz portage-44ade54c617432cc8836e5bf862705c347410cc9.tar.bz2 portage-44ade54c617432cc8836e5bf862705c347410cc9.zip | |
Tests: resolver/test_autounmask: Remove test that don't test what they were supposed to
| -rw-r--r-- | pym/portage/tests/resolver/ResolverPlayground.py | 1 | ||||
| -rw-r--r-- | pym/portage/tests/resolver/test_autounmask.py | 22 |
2 files changed, 1 insertions, 22 deletions
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py index 3740f8314..5d6d9d123 100644 --- 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 944e5485b..19d91484f 100644 --- 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) |