test_depth: use ambiguous_merge_order

diff --git a/pym/portage/tests/resolver/test_depth.py b/pym/portage/tests/resolver/test_depth.py
index ec3e23894ae44cdeb4ea89acb5f8eca8a7d1400b..8772acb30194d123e8172188f0c75da1da53fae0 100644 (file)
--- 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"],