1 |
commit: a9a50ee57b7fe7a85d7ee01f686e3572c3a89d3a |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 2 02:50:42 2011 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 2 02:50:42 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a9a50ee5 |
7 |
|
8 |
tests/emerge: test binary packages and emaint |
9 |
|
10 |
--- |
11 |
pym/portage/tests/emerge/test_simple.py | 13 ++++++++++++- |
12 |
1 files changed, 12 insertions(+), 1 deletions(-) |
13 |
|
14 |
diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py |
15 |
index 9c37699..3c3f3ec 100644 |
16 |
--- a/pym/portage/tests/emerge/test_simple.py |
17 |
+++ b/pym/portage/tests/emerge/test_simple.py |
18 |
@@ -82,6 +82,10 @@ src_install() { |
19 |
portage_python = portage._python_interpreter |
20 |
emerge_cmd = (portage_python, "-Wd", |
21 |
os.path.join(PORTAGE_BIN_PATH, "emerge")) |
22 |
+ emaint_cmd = (portage_python, "-Wd", |
23 |
+ os.path.join(PORTAGE_BIN_PATH, "emaint")) |
24 |
+ quickpkg_cmd = (portage_python, "-Wd", |
25 |
+ os.path.join(PORTAGE_BIN_PATH, "quickpkg")) |
26 |
|
27 |
test_commands = ( |
28 |
emerge_cmd + ("--version",), |
29 |
@@ -90,12 +94,17 @@ src_install() { |
30 |
emerge_cmd + ("--pretend", "dev-libs/A"), |
31 |
emerge_cmd + ("--pretend", "--tree", "--complete-graph", "dev-libs/A"), |
32 |
emerge_cmd + ("-p", "dev-libs/B"), |
33 |
- emerge_cmd + ("--oneshot", "dev-libs/B",), |
34 |
+ emerge_cmd + ("-B", "dev-libs/B",), |
35 |
+ emerge_cmd + ("--oneshot", "--usepkg", "dev-libs/B",), |
36 |
emerge_cmd + ("--oneshot", "dev-libs/A",), |
37 |
emerge_cmd + ("--noreplace", "dev-libs/A",), |
38 |
emerge_cmd + ("--pretend", "--depclean", "--verbose", "dev-libs/B"), |
39 |
emerge_cmd + ("--pretend", "--depclean",), |
40 |
emerge_cmd + ("--depclean",), |
41 |
+ quickpkg_cmd + ("dev-libs/A",), |
42 |
+ emerge_cmd + ("--usepkgonly", "dev-libs/A"), |
43 |
+ emaint_cmd + ("--check", "all"), |
44 |
+ emaint_cmd + ("--fix", "all"), |
45 |
emerge_cmd + ("--unmerge", "--quiet", "dev-libs/A"), |
46 |
emerge_cmd + ("-C", "--quiet", "dev-libs/B"), |
47 |
) |
48 |
@@ -104,6 +113,7 @@ src_install() { |
49 |
settings = playground.settings |
50 |
eprefix = settings["EPREFIX"] |
51 |
distdir = os.path.join(eprefix, "distdir") |
52 |
+ pkgdir = os.path.join(eprefix, "pkgdir") |
53 |
fake_bin = os.path.join(eprefix, "bin") |
54 |
portage_tmpdir = os.path.join(eprefix, "var", "tmp", "portage") |
55 |
portdir = settings["PORTDIR"] |
56 |
@@ -138,6 +148,7 @@ src_install() { |
57 |
"INFODIR" : "", |
58 |
"INFOPATH" : "", |
59 |
"PATH" : path, |
60 |
+ "PKGDIR" : pkgdir, |
61 |
"PORTAGE_GRPNAME" : os.environ["PORTAGE_GRPNAME"], |
62 |
"PORTAGE_INST_GID" : str(portage.data.portage_gid), |
63 |
"PORTAGE_INST_UID" : str(portage.data.portage_uid), |