diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-08-20 00:55:46 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-19 16:13:34 -0700 |
| commit | 5df435358a79636ec50c51a3d9e21a96e04320e5 (patch) | |
| tree | c1726c4fc508417c2cc8061ea1c3250a035cc4ac | |
| parent | 0d88d3c34ef3c252432dda5fef81e19325ed50ca (diff) | |
| download | portage-5df435358a79636ec50c51a3d9e21a96e04320e5.tar.gz portage-5df435358a79636ec50c51a3d9e21a96e04320e5.tar.bz2 portage-5df435358a79636ec50c51a3d9e21a96e04320e5.zip | |
Tests: ResolverPlayground: Support checking the suggestions given by the circular dep handler.
| -rw-r--r-- | pym/portage/tests/resolver/ResolverPlayground.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py index 7945f2688..fb691ba63 100644 --- a/pym/portage/tests/resolver/ResolverPlayground.py +++ b/pym/portage/tests/resolver/ResolverPlayground.py @@ -280,6 +280,7 @@ class ResolverPlaygroundTestCase(object): "use_changes": None, "unstable_keywords": None, "slot_collision_solutions": None, + "circular_dependency_solutions": None, } self.all_permutations = kwargs.pop("all_permutations", False) @@ -330,6 +331,7 @@ class ResolverPlaygroundResult(object): self.use_changes = None self.unstable_keywords = None self.slot_collision_solutions = None + self.circular_dependency_solutions = None if self.depgraph._dynamic_config._serialized_tasks_cache is not None: self.mergelist = [] @@ -366,3 +368,9 @@ class ResolverPlaygroundResult(object): changes[flag] = False s[pkg.cpv] = changes self.slot_collision_solutions.append(s) + + if self.depgraph._dynamic_config._circular_dependency_handler is not None: + handler = self.depgraph._dynamic_config._circular_dependency_handler + sol = handler.solutions + self.circular_dependency_solutions = dict( zip([x.cpv for x in sol.keys()], sol.values()) ) + |