| 1 |
commit: 31beb09d14dc29b84a234fc9fa8f44e42a6c4204 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 5 08:45:10 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 5 08:45:10 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=31beb09d |
| 7 |
|
| 8 |
SlotAbiEmergeTestCase: test new downgrade code |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/tests/emerge/test_emerge_slot_abi.py | 9 ++++++--- |
| 12 |
1 files changed, 6 insertions(+), 3 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/tests/emerge/test_emerge_slot_abi.py b/pym/portage/tests/emerge/test_emerge_slot_abi.py |
| 15 |
index 005c5d3..f18bd12 100644 |
| 16 |
--- a/pym/portage/tests/emerge/test_emerge_slot_abi.py |
| 17 |
+++ b/pym/portage/tests/emerge/test_emerge_slot_abi.py |
| 18 |
@@ -66,6 +66,8 @@ class SlotAbiEmergeTestCase(TestCase): |
| 19 |
vardb = trees[eroot]["vartree"].dbapi |
| 20 |
portdir = settings["PORTDIR"] |
| 21 |
var_cache_edb = os.path.join(eprefix, "var", "cache", "edb") |
| 22 |
+ user_config_dir = os.path.join(eprefix, USER_CONFIG_PATH) |
| 23 |
+ package_mask_path = os.path.join(user_config_dir, "package.mask") |
| 24 |
|
| 25 |
portage_python = portage._python_interpreter |
| 26 |
ebuild_cmd = (portage_python, "-Wd", |
| 27 |
@@ -79,8 +81,10 @@ class SlotAbiEmergeTestCase(TestCase): |
| 28 |
test_commands = ( |
| 29 |
emerge_cmd + ("--oneshot", "dev-libs/glib",), |
| 30 |
(lambda: "dev-libs/glib:2/2.32=" in vardb.aux_get("dev-libs/dbus-glib-0.98", ["RDEPEND"])[0],), |
| 31 |
- emerge_cmd + ("--oneshot", "=dev-libs/glib-2.30.2", "--ignore-built-slot-abi-deps", "y"), |
| 32 |
- emerge_cmd + ("--oneshot", "dev-libs/dbus-glib"), |
| 33 |
+ (BASH_BINARY, "-c", "echo %s >> %s" % |
| 34 |
+ tuple(map(portage._shell_quote, |
| 35 |
+ (">=dev-libs/glib-2.32", package_mask_path,)))), |
| 36 |
+ emerge_cmd + ("--oneshot", "dev-libs/glib",), |
| 37 |
(lambda: "dev-libs/glib:2/2.30=" in vardb.aux_get("dev-libs/dbus-glib-0.98", ["RDEPEND"])[0],), |
| 38 |
) |
| 39 |
|
| 40 |
@@ -89,7 +93,6 @@ class SlotAbiEmergeTestCase(TestCase): |
| 41 |
fake_bin = os.path.join(eprefix, "bin") |
| 42 |
portage_tmpdir = os.path.join(eprefix, "var", "tmp", "portage") |
| 43 |
profile_path = settings.profile_path |
| 44 |
- user_config_dir = os.path.join(os.sep, eprefix, USER_CONFIG_PATH) |
| 45 |
|
| 46 |
features = [] |
| 47 |
if not portage.process.sandbox_capable or \ |
Archives