diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-07-05 01:45:10 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-07-05 01:45:10 -0700 |
| commit | 31beb09d14dc29b84a234fc9fa8f44e42a6c4204 (patch) | |
| tree | 1ae1ff16e41af1a5399e254465f8799df46f4ae9 /pym | |
| parent | vartree.py: fix stutter in comment (diff) | |
| download | portage-31beb09d14dc29b84a234fc9fa8f44e42a6c4204.tar.gz portage-31beb09d14dc29b84a234fc9fa8f44e42a6c4204.tar.bz2 portage-31beb09d14dc29b84a234fc9fa8f44e42a6c4204.zip | |
SlotAbiEmergeTestCase: test new downgrade code
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/tests/emerge/test_emerge_slot_abi.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pym/portage/tests/emerge/test_emerge_slot_abi.py b/pym/portage/tests/emerge/test_emerge_slot_abi.py index 005c5d354..f18bd123b 100644 --- a/pym/portage/tests/emerge/test_emerge_slot_abi.py +++ b/pym/portage/tests/emerge/test_emerge_slot_abi.py @@ -66,6 +66,8 @@ class SlotAbiEmergeTestCase(TestCase): vardb = trees[eroot]["vartree"].dbapi portdir = settings["PORTDIR"] var_cache_edb = os.path.join(eprefix, "var", "cache", "edb") + user_config_dir = os.path.join(eprefix, USER_CONFIG_PATH) + package_mask_path = os.path.join(user_config_dir, "package.mask") portage_python = portage._python_interpreter ebuild_cmd = (portage_python, "-Wd", @@ -79,8 +81,10 @@ class SlotAbiEmergeTestCase(TestCase): test_commands = ( emerge_cmd + ("--oneshot", "dev-libs/glib",), (lambda: "dev-libs/glib:2/2.32=" in vardb.aux_get("dev-libs/dbus-glib-0.98", ["RDEPEND"])[0],), - emerge_cmd + ("--oneshot", "=dev-libs/glib-2.30.2", "--ignore-built-slot-abi-deps", "y"), - emerge_cmd + ("--oneshot", "dev-libs/dbus-glib"), + (BASH_BINARY, "-c", "echo %s >> %s" % + tuple(map(portage._shell_quote, + (">=dev-libs/glib-2.32", package_mask_path,)))), + emerge_cmd + ("--oneshot", "dev-libs/glib",), (lambda: "dev-libs/glib:2/2.30=" in vardb.aux_get("dev-libs/dbus-glib-0.98", ["RDEPEND"])[0],), ) @@ -89,7 +93,6 @@ class SlotAbiEmergeTestCase(TestCase): fake_bin = os.path.join(eprefix, "bin") portage_tmpdir = os.path.join(eprefix, "var", "tmp", "portage") profile_path = settings.profile_path - user_config_dir = os.path.join(os.sep, eprefix, USER_CONFIG_PATH) features = [] if not portage.process.sandbox_capable or \ |