diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-22 17:44:49 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-22 17:44:49 -0700 |
| commit | 436a3cea2e56d57fdae788a4fdaf49438a10b4e5 (patch) | |
| tree | 413add7cd4a84075b93be3b3c1a9fb9a6cf34c84 /pym | |
| parent | 6e6b9c5928e175af42615542866fc9b3aef694e6 (diff) | |
| download | portage-436a3cea2e56d57fdae788a4fdaf49438a10b4e5.tar.gz portage-436a3cea2e56d57fdae788a4fdaf49438a10b4e5.tar.bz2 portage-436a3cea2e56d57fdae788a4fdaf49438a10b4e5.zip | |
test_depth: use merge_order_assertions
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/tests/resolver/test_depth.py | 4 |
1 files changed, 3 insertions, 1 deletions
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"], |