diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-02-13 05:55:18 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-02-13 05:55:18 -0800 |
commit | f5eaf39529393b0b68f656b06600920791d9bec0 (patch) | |
tree | b94e7f940a7d869ca8a7ddc39010834f421767d5 /pym/portage/tests/resolver/test_depth.py | |
parent | 47bd6967b23e94431e717d57588714f772a6309d (diff) | |
download | portage-f5eaf39529393b0b68f656b06600920791d9bec0.tar.gz portage-f5eaf39529393b0b68f656b06600920791d9bec0.tar.bz2 portage-f5eaf39529393b0b68f656b06600920791d9bec0.zip |
depgraph: fix and test depth control for virtuals
Diffstat (limited to 'pym/portage/tests/resolver/test_depth.py')
-rw-r--r-- | pym/portage/tests/resolver/test_depth.py | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/pym/portage/tests/resolver/test_depth.py b/pym/portage/tests/resolver/test_depth.py index cecdd37e2..65cfac6c2 100644 --- a/pym/portage/tests/resolver/test_depth.py +++ b/pym/portage/tests/resolver/test_depth.py @@ -123,19 +123,28 @@ class ResolverDepthTestCase(TestCase): ["virtual/jre"], options = {"--update" : True}, success = 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 + # depth as direct dependencies. + ResolverPlaygroundTestCase( + ["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']), ResolverPlaygroundTestCase( ["virtual/jre:1.5"], options = {"--update" : True}, success = True, - mergelist = ['dev-java/gcj-jdk-4.5-r1', 'virtual/jdk-1.5.0-r1', 'virtual/jre-1.5.0-r1']), + mergelist = ['virtual/jre-1.5.0-r1']), ResolverPlaygroundTestCase( ["virtual/jre:1.6"], options = {"--update" : True}, success = True, - mergelist = ['dev-java/icedtea-6.1-r1', 'virtual/jdk-1.6.0-r1', 'virtual/jre-1.6.0-r1']), + mergelist = ['virtual/jre-1.6.0-r1']), # Test that we don't pull in any unnecessary updates # when --update is not specified, even though we @@ -146,12 +155,20 @@ class ResolverDepthTestCase(TestCase): success = True, mergelist = ["dev-java/ant-core-1.8"]), - # FIXME: pulls in unwanted updates without --deep: ['dev-java/icedtea-6.1-r1', 'virtual/jdk-1.6.0-r1', 'dev-java/ant-core-1.8'] - #ResolverPlaygroundTestCase( - # ["dev-java/ant-core"], - # options = {"--update" : True}, - # success = True, - # mergelist = ["dev-java/ant-core-1.8"]), + ResolverPlaygroundTestCase( + ["dev-java/ant-core"], + options = {"--update" : True}, + success = True, + mergelist = ["dev-java/ant-core-1.8"]), + + # Recursively traversed virtual dependencies, and their + # direct dependencies, are considered to have the same + # depth as direct dependencies. + ResolverPlaygroundTestCase( + ["dev-java/ant-core"], + options = {"--update" : True, "--deep" : 1}, + success = True, + mergelist = ['dev-java/icedtea-6.1-r1', 'virtual/jdk-1.6.0-r1', 'dev-java/ant-core-1.8']), ResolverPlaygroundTestCase( ["dev-db/hsqldb"], |