Merge backtracking test diff from master.

diff --git a/pym/portage/tests/resolver/test_backtracking.py b/pym/portage/tests/resolver/test_backtracking.py
index c8d04be8399f20d84a988d179d6c458c9794be7c..fc493062cb780b27235f3edc196a5e8e61f6024b 100644 (file)
--- a/pym/portage/tests/resolver/test_backtracking.py
+++ b/pym/portage/tests/resolver/test_backtracking.py
@@ -148,10 +148,12 @@ class BacktrackingTestCase(TestCase):
                        "dev-libs/B-1": { "USE": "", "RDEPEND": "<=dev-libs/A-1" },
                        }
 
+               options = {'--update' : True, '--deep' : True, '--selective' : True}
+
                test_cases = (
                                ResolverPlaygroundTestCase(
                                        ["dev-libs/A", "dev-libs/B"],
-                                       options = {'--update' : True, '--deep' : True},
+                                       options = options,
                                        all_permutations = True,
                                        mergelist = [],
                                        success = True),