projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
af50fee
)
SimpleResolverTestCase: handle PYTHONHASHSEED
author
Zac Medico
<zmedico@gentoo.org>
Sun, 13 May 2012 06:23:35 +0000
(23:23 -0700)
committer
Zac Medico
<zmedico@gentoo.org>
Sun, 13 May 2012 06:23:35 +0000
(23:23 -0700)
pym/portage/tests/resolver/test_simple.py
patch
|
blob
|
history
diff --git
a/pym/portage/tests/resolver/test_simple.py
b/pym/portage/tests/resolver/test_simple.py
index 0bcfc4b70f09ba7a852fff39139666995be2ac21..4c2e97ef273b84b2366d568946f2e3e11e139e68 100644
(file)
--- 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)