| 1 |
commit: 6feb5a12ed3b501ea5f65dad14d4026105469ad9 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 2 01:43:31 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 2 01:43:31 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6feb5a12 |
| 7 |
|
| 8 |
tests/emerge: enable arbitrary commands |
| 9 |
|
| 10 |
This will allow us to throw in some test commands for various helpers |
| 11 |
related to emerge (things like etc-update, dispatch-conf, quickpkg, |
| 12 |
portageq, ebuild, and emaint). |
| 13 |
|
| 14 |
--- |
| 15 |
pym/portage/tests/emerge/test_simple.py | 40 +++++++++++++++++-------------- |
| 16 |
1 files changed, 22 insertions(+), 18 deletions(-) |
| 17 |
|
| 18 |
diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py |
| 19 |
index 99fc96c..9c37699 100644 |
| 20 |
--- a/pym/portage/tests/emerge/test_simple.py |
| 21 |
+++ b/pym/portage/tests/emerge/test_simple.py |
| 22 |
@@ -79,21 +79,25 @@ src_install() { |
| 23 |
}, |
| 24 |
} |
| 25 |
|
| 26 |
- test_args = ( |
| 27 |
- ("--version",), |
| 28 |
- ("--info",), |
| 29 |
- ("--info", "--verbose"), |
| 30 |
- ("--pretend", "dev-libs/A"), |
| 31 |
- ("--pretend", "--tree", "--complete-graph", "dev-libs/A"), |
| 32 |
- ("-p", "dev-libs/B"), |
| 33 |
- ("--oneshot", "dev-libs/B",), |
| 34 |
- ("--oneshot", "dev-libs/A",), |
| 35 |
- ("--noreplace", "dev-libs/A",), |
| 36 |
- ("--pretend", "--depclean", "--verbose", "dev-libs/B"), |
| 37 |
- ("--pretend", "--depclean",), |
| 38 |
- ("--depclean",), |
| 39 |
- ("--unmerge", "--quiet", "dev-libs/A"), |
| 40 |
- ("-C", "--quiet", "dev-libs/B"), |
| 41 |
+ portage_python = portage._python_interpreter |
| 42 |
+ emerge_cmd = (portage_python, "-Wd", |
| 43 |
+ os.path.join(PORTAGE_BIN_PATH, "emerge")) |
| 44 |
+ |
| 45 |
+ test_commands = ( |
| 46 |
+ emerge_cmd + ("--version",), |
| 47 |
+ emerge_cmd + ("--info",), |
| 48 |
+ emerge_cmd + ("--info", "--verbose"), |
| 49 |
+ emerge_cmd + ("--pretend", "dev-libs/A"), |
| 50 |
+ emerge_cmd + ("--pretend", "--tree", "--complete-graph", "dev-libs/A"), |
| 51 |
+ emerge_cmd + ("-p", "dev-libs/B"), |
| 52 |
+ emerge_cmd + ("--oneshot", "dev-libs/B",), |
| 53 |
+ emerge_cmd + ("--oneshot", "dev-libs/A",), |
| 54 |
+ emerge_cmd + ("--noreplace", "dev-libs/A",), |
| 55 |
+ emerge_cmd + ("--pretend", "--depclean", "--verbose", "dev-libs/B"), |
| 56 |
+ emerge_cmd + ("--pretend", "--depclean",), |
| 57 |
+ emerge_cmd + ("--depclean",), |
| 58 |
+ emerge_cmd + ("--unmerge", "--quiet", "dev-libs/A"), |
| 59 |
+ emerge_cmd + ("-C", "--quiet", "dev-libs/B"), |
| 60 |
) |
| 61 |
|
| 62 |
playground = ResolverPlayground(ebuilds=ebuilds, installed=installed) |
| 63 |
@@ -137,6 +141,7 @@ src_install() { |
| 64 |
"PORTAGE_GRPNAME" : os.environ["PORTAGE_GRPNAME"], |
| 65 |
"PORTAGE_INST_GID" : str(portage.data.portage_gid), |
| 66 |
"PORTAGE_INST_UID" : str(portage.data.portage_uid), |
| 67 |
+ "PORTAGE_PYTHON" : portage_python, |
| 68 |
"PORTAGE_TMPDIR" : portage_tmpdir, |
| 69 |
"PORTAGE_USERNAME" : os.environ["PORTAGE_USERNAME"], |
| 70 |
"PORTDIR" : portdir, |
| 71 |
@@ -158,9 +163,8 @@ src_install() { |
| 72 |
# non-empty system set keeps --depclean quiet |
| 73 |
with open(os.path.join(profile_path, "packages"), 'w') as f: |
| 74 |
f.write("*dev-libs/token-system-pkg") |
| 75 |
- for args in test_args: |
| 76 |
- proc = subprocess.Popen([portage._python_interpreter, "-Wd", |
| 77 |
- os.path.join(PORTAGE_BIN_PATH, "emerge")] + list(args), |
| 78 |
+ for args in test_commands: |
| 79 |
+ proc = subprocess.Popen(args, |
| 80 |
env=env, stdout=subprocess.PIPE) |
| 81 |
output = proc.stdout.readlines() |
| 82 |
proc.wait() |
Archives