diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-21 15:36:41 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-21 15:36:41 -0700 |
| commit | 5933561be0ed3a6d46ba9608edff79bbeb8cd7f1 (patch) | |
| tree | f9089ed81638dd88b2bb4d6d49ce20527519b35d | |
| parent | db3521bdd5c57a20a8f3bf04a84fcd65430e39c9 (diff) | |
| download | portage-5933561be0ed3a6d46ba9608edff79bbeb8cd7f1.tar.gz portage-5933561be0ed3a6d46ba9608edff79bbeb8cd7f1.tar.bz2 portage-5933561be0ed3a6d46ba9608edff79bbeb8cd7f1.zip | |
test_merge_order: fix bugs in previous commit
| -rw-r--r-- | pym/portage/tests/resolver/test_merge_order.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage/tests/resolver/test_merge_order.py index bae9bcadb..548f203fe 100644 --- a/pym/portage/tests/resolver/test_merge_order.py +++ b/pym/portage/tests/resolver/test_merge_order.py @@ -17,9 +17,7 @@ class MergeOrderTestCase(TestCase): "EAPI" : "2", "DEPEND" : "!!app-misc/installed-blocker-a", }, - "app-misc/blocker-update-order-a-1" : { - "RDEPEND" : ">=app-misc/installed-old-version-blocks-a-2" - }, + "app-misc/blocker-update-order-a-1" : {}, "app-misc/blocker-runtime-a-1" : {}, "app-misc/blocker-runtime-hard-a-1" : {}, "app-misc/circ-buildtime-a-0": {}, @@ -85,7 +83,7 @@ class MergeOrderTestCase(TestCase): "RDEPEND" : "!app-misc/blocker-runtime-a !!app-misc/blocker-runtime-hard-a", }, "app-misc/installed-old-version-blocks-a-1" : { - "RDEPEND" : "!app-misc/installed-old-version-blocks-a", + "RDEPEND" : "!app-misc/blocker-update-order-a", }, "app-misc/installed-old-version-blocks-a-2" : {}, "app-misc/some-app-a-1": { @@ -117,7 +115,7 @@ class MergeOrderTestCase(TestCase): "RDEPEND" : "!app-misc/blocker-runtime-a !!app-misc/blocker-runtime-hard-a", }, "app-misc/installed-old-version-blocks-a-1" : { - "RDEPEND" : "!app-misc/installed-old-version-blocks-a", + "RDEPEND" : "!app-misc/blocker-update-order-a", }, } @@ -179,8 +177,9 @@ class MergeOrderTestCase(TestCase): # be updated first, in order to solve the blocker without # any need for blocking packages to temporarily overlap. ResolverPlaygroundTestCase( - ["app-misc/blocker-update-order-a"], + ["app-misc/blocker-update-order-a", "app-misc/installed-old-version-blocks-a"], success = True, + all_permutations = True, mergelist = ["app-misc/installed-old-version-blocks-a-2", "app-misc/blocker-update-order-a-1"]), # installed package has runtime blocker that # should cause it to be uninstalled |