diff options
| -rw-r--r-- | lib/portage/tests/resolver/test_autounmask.py | 4 | ||||
| -rw-r--r-- | lib/portage/tests/resolver/test_keywords.py | 15 | ||||
| -rw-r--r-- | lib/portage/tests/resolver/test_slot_operator_autounmask.py | 4 |
3 files changed, 19 insertions, 4 deletions
diff --git a/lib/portage/tests/resolver/test_autounmask.py b/lib/portage/tests/resolver/test_autounmask.py index 809d42104..64718dbf9 100644 --- a/lib/portage/tests/resolver/test_autounmask.py +++ b/lib/portage/tests/resolver/test_autounmask.py @@ -1,4 +1,4 @@ -# Copyright 2010-2018 Gentoo Foundation +# Copyright 2010-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 from portage.tests import TestCase @@ -579,12 +579,14 @@ class AutounmaskTestCase(TestCase): ResolverPlaygroundTestCase( ["dev-libs/B"], success=False, + options={"--autounmask": True}, mergelist=["dev-libs/A-2", "dev-libs/B-1"], needed_p_mask_changes=set(["dev-libs/A-2"])), ResolverPlaygroundTestCase( ["dev-libs/C"], success=False, + options={"--autounmask": True}, mergelist=["dev-libs/A-9999", "dev-libs/C-1"], unstable_keywords=set(["dev-libs/A-9999"]), needed_p_mask_changes=set(["dev-libs/A-9999"])), diff --git a/lib/portage/tests/resolver/test_keywords.py b/lib/portage/tests/resolver/test_keywords.py index d59ea5881..7989bbac5 100644 --- a/lib/portage/tests/resolver/test_keywords.py +++ b/lib/portage/tests/resolver/test_keywords.py @@ -1,4 +1,4 @@ -# Copyright 2011 Gentoo Foundation +# Copyright 2011-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 from portage.tests import TestCase @@ -37,6 +37,7 @@ class KeywordsTestCase(TestCase): ResolverPlaygroundTestCase( ['app-misc/B'], success = False, + options={'--autounmask': True}, unstable_keywords = ('app-misc/B-1',), mergelist = ['app-misc/B-1']), @@ -48,24 +49,28 @@ class KeywordsTestCase(TestCase): ResolverPlaygroundTestCase( ['app-misc/D'], success = False, + options={'--autounmask': True}, unstable_keywords = ('app-misc/D-1',), mergelist = ['app-misc/D-1']), ResolverPlaygroundTestCase( ['app-misc/E'], success = False, + options={'--autounmask': True}, unstable_keywords = ('app-misc/E-1',), mergelist = ['app-misc/E-1']), ResolverPlaygroundTestCase( ['app-misc/F'], success = False, + options={'--autounmask': True}, unstable_keywords = ('app-misc/F-1',), mergelist = ['app-misc/F-1']), ResolverPlaygroundTestCase( ['app-misc/G'], success = False, + options={'--autounmask': True}, unstable_keywords = ('app-misc/G-1',), mergelist = ['app-misc/G-1']), ) @@ -109,6 +114,7 @@ class KeywordsTestCase(TestCase): ResolverPlaygroundTestCase( ['app-misc/B'], success = False, + options={'--autounmask': True}, unstable_keywords = ('app-misc/B-1',), mergelist = ['app-misc/B-1']), @@ -120,6 +126,7 @@ class KeywordsTestCase(TestCase): ResolverPlaygroundTestCase( ['app-misc/D'], success = False, + options={'--autounmask': True}, unstable_keywords = ('app-misc/D-1',), mergelist = ['app-misc/D-1']), @@ -131,12 +138,14 @@ class KeywordsTestCase(TestCase): ResolverPlaygroundTestCase( ['app-misc/F'], success = False, + options={'--autounmask': True}, unstable_keywords = ('app-misc/F-1',), mergelist = ['app-misc/F-1']), ResolverPlaygroundTestCase( ['app-misc/G'], success = False, + options={'--autounmask': True}, unstable_keywords = ('app-misc/G-1',), mergelist = ['app-misc/G-1']), ) @@ -195,18 +204,21 @@ class KeywordsTestCase(TestCase): ResolverPlaygroundTestCase( ['app-misc/E'], success = False, + options={'--autounmask': True}, unstable_keywords = ('app-misc/E-1',), mergelist = ['app-misc/E-1']), ResolverPlaygroundTestCase( ['app-misc/F'], success = False, + options={'--autounmask': True}, unstable_keywords = ('app-misc/F-1',), mergelist = ['app-misc/F-1']), ResolverPlaygroundTestCase( ['app-misc/G'], success = False, + options={'--autounmask': True}, unstable_keywords = ('app-misc/G-1',), mergelist = ['app-misc/G-1']), ) @@ -275,6 +287,7 @@ class KeywordsTestCase(TestCase): ResolverPlaygroundTestCase( ['app-misc/G'], success = False, + options={'--autounmask': True}, unstable_keywords = ('app-misc/G-1',), mergelist = ['app-misc/G-1']), ) diff --git a/lib/portage/tests/resolver/test_slot_operator_autounmask.py b/lib/portage/tests/resolver/test_slot_operator_autounmask.py index 42efa6682..5ab8e1f67 100644 --- a/lib/portage/tests/resolver/test_slot_operator_autounmask.py +++ b/lib/portage/tests/resolver/test_slot_operator_autounmask.py @@ -73,14 +73,14 @@ class SlotOperatorAutoUnmaskTestCase(TestCase): ResolverPlaygroundTestCase( ["dev-libs/icu"], - options = {"--oneshot": True, "--usepkg": True}, + options = {"--autounmask": True, "--oneshot": True, "--usepkg": True}, success = False, mergelist = ["[binary]dev-libs/icu-49", "dev-libs/libxml2-2.7.8" ], unstable_keywords = ['dev-libs/libxml2-2.7.8']), ResolverPlaygroundTestCase( ["dev-libs/icu"], - options = {"--oneshot": True, "--usepkgonly": True}, + options = {"--autounmask": True, "--oneshot": True, "--usepkgonly": True}, success = True, mergelist = ["[binary]dev-libs/icu-4.8"]), |