From: Zac Medico Date: Mon, 23 May 2011 00:44:49 +0000 (-0700) Subject: test_depth: use merge_order_assertions X-Git-Tag: v2.2.0_alpha35~3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=436a3cea2e56d57fdae788a4fdaf49438a10b4e5;p=portage.git test_depth: use merge_order_assertions --- diff --git a/pym/portage/tests/resolver/test_depth.py b/pym/portage/tests/resolver/test_depth.py index 8772acb30..cb1e2dd5d 100644 --- a/pym/portage/tests/resolver/test_depth.py +++ b/pym/portage/tests/resolver/test_depth.py @@ -145,7 +145,9 @@ class ResolverDepthTestCase(TestCase): options = {"--update" : True, "--deep" : 1}, success = True, 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')]), + merge_order_assertions=(('dev-java/icedtea-6.1-r1', 'virtual/jdk-1.6.0-r1'), ('virtual/jdk-1.6.0-r1', 'virtual/jre-1.6.0-r1'), + ('dev-java/gcj-jdk-4.5-r1', 'virtual/jdk-1.5.0-r1'), ('virtual/jdk-1.5.0-r1', 'virtual/jre-1.5.0-r1')), + 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"],