diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-05-12 23:23:35 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-05-12 23:23:35 -0700 |
| commit | d7525a7e433ee77f7c94ab468ff66af4f2913684 (patch) | |
| tree | 26633dd2076dbc30d5092eb8801d883f6c6b705e | |
| parent | af50fee789e71c1fff0b405db4cf55b618b73466 (diff) | |
| download | portage-d7525a7e433ee77f7c94ab468ff66af4f2913684.tar.gz portage-d7525a7e433ee77f7c94ab468ff66af4f2913684.tar.bz2 portage-d7525a7e433ee77f7c94ab468ff66af4f2913684.zip | |
SimpleResolverTestCase: handle PYTHONHASHSEED
| -rw-r--r-- | pym/portage/tests/resolver/test_simple.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage/tests/resolver/test_simple.py b/pym/portage/tests/resolver/test_simple.py index 0bcfc4b70..4c2e97ef2 100644 --- a/pym/portage/tests/resolver/test_simple.py +++ b/pym/portage/tests/resolver/test_simple.py @@ -45,7 +45,8 @@ class SimpleResolverTestCase(TestCase): ResolverPlaygroundTestCase( ["app-misc/Z"], success = True, - mergelist = ["app-misc/W-1", "app-misc/X-1", "app-misc/Z-1"]), + ambiguous_merge_order = True, + mergelist = [("app-misc/W-1", "app-misc/X-1"), "app-misc/Z-1"]), ) playground = ResolverPlayground(ebuilds=ebuilds, installed=installed) |