From 5df435358a79636ec50c51a3d9e21a96e04320e5 Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Fri, 20 Aug 2010 00:55:46 +0200 Subject: Tests: ResolverPlayground: Support checking the suggestions given by the circular dep handler. --- pym/portage/tests/resolver/ResolverPlayground.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pym') 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()) ) + -- cgit v1.2.3-1-g7c22