From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:2.1.9 commit in: pym/portage/tests/resolver/
Date: Thu, 26 May 2011 06:18:38 +0000 (UTC) [thread overview]
Message-ID: <eaace2f20c6a9b1f1244997dcf5f4ac85623a4a4.zmedico@gentoo> (raw)
commit: eaace2f20c6a9b1f1244997dcf5f4ac85623a4a4
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat May 21 22:36:41 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu May 26 03:48:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=eaace2f2
test_merge_order: fix bugs in previous commit
---
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 bae9bca..548f203 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
next reply other threads:[~2011-05-26 6:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-26 6:18 Zac Medico [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-05-26 6:18 [gentoo-commits] proj/portage:2.1.9 commit in: pym/portage/tests/resolver/ Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-05-26 6:18 Zac Medico
2011-02-20 0:04 Zac Medico
2011-02-14 4:31 Zac Medico
2011-02-14 4:31 Zac Medico
2011-02-14 4:31 Zac Medico
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eaace2f20c6a9b1f1244997dcf5f4ac85623a4a4.zmedico@gentoo \
--to=zmedico@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox