From a9a50ee57b7fe7a85d7ee01f686e3572c3a89d3a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 1 Sep 2011 19:50:42 -0700 Subject: tests/emerge: test binary packages and emaint --- pym/portage/tests/emerge/test_simple.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py index 9c3769925..3c3f3ec70 100644 --- a/pym/portage/tests/emerge/test_simple.py +++ b/pym/portage/tests/emerge/test_simple.py @@ -82,6 +82,10 @@ src_install() { portage_python = portage._python_interpreter emerge_cmd = (portage_python, "-Wd", os.path.join(PORTAGE_BIN_PATH, "emerge")) + emaint_cmd = (portage_python, "-Wd", + os.path.join(PORTAGE_BIN_PATH, "emaint")) + quickpkg_cmd = (portage_python, "-Wd", + os.path.join(PORTAGE_BIN_PATH, "quickpkg")) test_commands = ( emerge_cmd + ("--version",), @@ -90,12 +94,17 @@ src_install() { emerge_cmd + ("--pretend", "dev-libs/A"), emerge_cmd + ("--pretend", "--tree", "--complete-graph", "dev-libs/A"), emerge_cmd + ("-p", "dev-libs/B"), - emerge_cmd + ("--oneshot", "dev-libs/B",), + emerge_cmd + ("-B", "dev-libs/B",), + emerge_cmd + ("--oneshot", "--usepkg", "dev-libs/B",), emerge_cmd + ("--oneshot", "dev-libs/A",), emerge_cmd + ("--noreplace", "dev-libs/A",), emerge_cmd + ("--pretend", "--depclean", "--verbose", "dev-libs/B"), emerge_cmd + ("--pretend", "--depclean",), emerge_cmd + ("--depclean",), + quickpkg_cmd + ("dev-libs/A",), + emerge_cmd + ("--usepkgonly", "dev-libs/A"), + emaint_cmd + ("--check", "all"), + emaint_cmd + ("--fix", "all"), emerge_cmd + ("--unmerge", "--quiet", "dev-libs/A"), emerge_cmd + ("-C", "--quiet", "dev-libs/B"), ) @@ -104,6 +113,7 @@ src_install() { settings = playground.settings eprefix = settings["EPREFIX"] distdir = os.path.join(eprefix, "distdir") + pkgdir = os.path.join(eprefix, "pkgdir") fake_bin = os.path.join(eprefix, "bin") portage_tmpdir = os.path.join(eprefix, "var", "tmp", "portage") portdir = settings["PORTDIR"] @@ -138,6 +148,7 @@ src_install() { "INFODIR" : "", "INFOPATH" : "", "PATH" : path, + "PKGDIR" : pkgdir, "PORTAGE_GRPNAME" : os.environ["PORTAGE_GRPNAME"], "PORTAGE_INST_GID" : str(portage.data.portage_gid), "PORTAGE_INST_UID" : str(portage.data.portage_uid), -- cgit v1.2.3-1-g7c22