diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-22 02:03:04 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-22 02:03:04 -0700 |
| commit | 060575bae5a14f719cf839b23b6f2f59a42107b5 (patch) | |
| tree | b8e7adc48a9f050d8f73bae7a2f23908600246ea /pym | |
| parent | d4bf8dc02293cfc81c19f39b12b5e180a5e12645 (diff) | |
| download | portage-060575bae5a14f719cf839b23b6f2f59a42107b5.tar.gz portage-060575bae5a14f719cf839b23b6f2f59a42107b5.tar.bz2 portage-060575bae5a14f719cf839b23b6f2f59a42107b5.zip | |
Fix spelling of "ambiguous".
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/tests/resolver/ResolverPlayground.py | 4 | ||||
| -rw-r--r-- | pym/portage/tests/resolver/test_merge_order.py | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py index 8e7f600b1..48ce6e74a 100644 --- a/pym/portage/tests/resolver/ResolverPlayground.py +++ b/pym/portage/tests/resolver/ResolverPlayground.py @@ -474,7 +474,7 @@ class ResolverPlaygroundTestCase(object): def __init__(self, request, **kwargs): self.all_permutations = kwargs.pop("all_permutations", False) self.ignore_mergelist_order = kwargs.pop("ignore_mergelist_order", False) - self.ambigous_merge_order = kwargs.pop("ambigous_merge_order", False) + self.ambiguous_merge_order = kwargs.pop("ambiguous_merge_order", False) self.check_repo_names = kwargs.pop("check_repo_names", False) self.merge_order_assertions = kwargs.pop("merge_order_assertions", False) @@ -535,7 +535,7 @@ class ResolverPlaygroundTestCase(object): got = set(got) expected = set(expected) - if self.ambigous_merge_order and got: + if self.ambiguous_merge_order and got: expected_stack = list(reversed(expected)) got_stack = list(reversed(got)) new_expected = [] diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage/tests/resolver/test_merge_order.py index 548f203fe..fdbfcb54d 100644 --- a/pym/portage/tests/resolver/test_merge_order.py +++ b/pym/portage/tests/resolver/test_merge_order.py @@ -123,12 +123,12 @@ class MergeOrderTestCase(TestCase): ResolverPlaygroundTestCase( ["app-misc/some-app-a"], success = True, - ambigous_merge_order = True, + ambiguous_merge_order = True, mergelist = [("app-misc/circ-runtime-a-1", "app-misc/circ-runtime-b-1", "app-misc/circ-runtime-c-1"), "app-misc/some-app-a-1"]), ResolverPlaygroundTestCase( ["app-misc/some-app-a"], success = True, - ambigous_merge_order = True, + ambiguous_merge_order = True, mergelist = [("app-misc/circ-runtime-c-1", "app-misc/circ-runtime-b-1", "app-misc/circ-runtime-a-1"), "app-misc/some-app-a-1"]), # Test unsolvable circular dep that is RDEPEND in one # direction and DEPEND in the other. @@ -143,14 +143,14 @@ class MergeOrderTestCase(TestCase): ResolverPlaygroundTestCase( ["app-misc/some-app-c", "app-misc/circ-buildtime-a"], success = True, - ambigous_merge_order = True, + ambiguous_merge_order = True, mergelist = [("app-misc/circ-buildtime-b-1", "app-misc/circ-buildtime-c-1"), "app-misc/circ-buildtime-a-1", "app-misc/some-app-c-1"]), # Test optimal merge order for a circular dep that is # RDEPEND in one direction and PDEPEND in the other. ResolverPlaygroundTestCase( ["app-misc/some-app-b"], success = True, - ambigous_merge_order = True, + ambiguous_merge_order = True, mergelist = ["app-misc/circ-post-runtime-a-1", ("app-misc/circ-post-runtime-b-1", "app-misc/circ-post-runtime-c-1"), "app-misc/some-app-b-1"]), # Test optimal merge order for a circular dep that is # RDEPEND in one direction and DEPEND in the other, @@ -162,7 +162,7 @@ class MergeOrderTestCase(TestCase): ["app-misc/circ-satisfied-a", "app-misc/circ-satisfied-b", "app-misc/circ-satisfied-c"], success = True, all_permutations = True, - ambigous_merge_order = True, + ambiguous_merge_order = True, merge_order_assertions = (("app-misc/circ-satisfied-a-1", "app-misc/circ-satisfied-c-1"),), mergelist = [("app-misc/circ-satisfied-a-1", "app-misc/circ-satisfied-b-1", "app-misc/circ-satisfied-c-1")]), # installed package has buildtime-only blocker |