diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-22 10:03:05 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-25 20:51:52 -0700 |
| commit | 4d77cd685678879d114603196787e2c796df9b2e (patch) | |
| tree | 3d3c61189aa3fe767a18342a614757fecfba82e6 | |
| parent | 3a80fd6b55d4e697bcacf5c92fca487de13c325f (diff) | |
| download | portage-4d77cd685678879d114603196787e2c796df9b2e.tar.gz portage-4d77cd685678879d114603196787e2c796df9b2e.tar.bz2 portage-4d77cd685678879d114603196787e2c796df9b2e.zip | |
test_depth: use ambiguous_merge_order
| -rw-r--r-- | pym/portage/tests/resolver/test_depth.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage/tests/resolver/test_depth.py b/pym/portage/tests/resolver/test_depth.py index ec3e23894..8772acb30 100644 --- a/pym/portage/tests/resolver/test_depth.py +++ b/pym/portage/tests/resolver/test_depth.py @@ -134,7 +134,8 @@ class ResolverDepthTestCase(TestCase): ["virtual/jre"], options = {"--update" : True}, success = True, - mergelist = ['virtual/jre-1.6.0-r1', 'virtual/jre-1.5.0-r1']), + ambiguous_merge_order = True, + mergelist = [('virtual/jre-1.6.0-r1', 'virtual/jre-1.5.0-r1')]), # Recursively traversed virtual dependencies, and their # direct dependencies, are considered to have the same @@ -143,7 +144,8 @@ class ResolverDepthTestCase(TestCase): ["virtual/jre"], options = {"--update" : True, "--deep" : 1}, success = True, - mergelist = ['dev-java/icedtea-6.1-r1', 'dev-java/gcj-jdk-4.5-r1', 'virtual/jdk-1.6.0-r1', 'virtual/jdk-1.5.0-r1', 'virtual/jre-1.6.0-r1', 'virtual/jre-1.5.0-r1']), + ambiguous_merge_order = True, + mergelist = [('dev-java/icedtea-6.1-r1', 'dev-java/gcj-jdk-4.5-r1'), ('virtual/jdk-1.6.0-r1', 'virtual/jdk-1.5.0-r1', 'virtual/jre-1.6.0-r1', 'virtual/jre-1.5.0-r1')]), ResolverPlaygroundTestCase( ["virtual/jre:1.5"], |