| 1 |
commit: 4bbfe6241ec7a4d286a1e8b3074c9dde0de4f2ea |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 19:22:51 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 19:22:51 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4bbfe624 |
| 7 |
|
| 8 |
Tweak failure msgs in emerge/repoman tests. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/tests/emerge/test_simple.py | 3 ++- |
| 12 |
pym/portage/tests/repoman/test_simple.py | 7 ++++--- |
| 13 |
2 files changed, 6 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py |
| 16 |
index 971193f..b698fca 100644 |
| 17 |
--- a/pym/portage/tests/emerge/test_simple.py |
| 18 |
+++ b/pym/portage/tests/emerge/test_simple.py |
| 19 |
@@ -140,6 +140,7 @@ class SimpleEmergeTestCase(TestCase): |
| 20 |
for line in output: |
| 21 |
sys.stderr.write(_unicode_decode(line)) |
| 22 |
|
| 23 |
- self.assertEqual(os.EX_OK, proc.returncode, "emerge failed") |
| 24 |
+ self.assertEqual(os.EX_OK, proc.returncode, |
| 25 |
+ "emerge failed with args %s" % (args,)) |
| 26 |
finally: |
| 27 |
playground.cleanup() |
| 28 |
|
| 29 |
diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py |
| 30 |
index bfc32fc..35290f6 100644 |
| 31 |
--- a/pym/portage/tests/repoman/test_simple.py |
| 32 |
+++ b/pym/portage/tests/repoman/test_simple.py |
| 33 |
@@ -158,10 +158,10 @@ class SimpleRepomanTestCase(TestCase): |
| 34 |
# order to ensure that the CTIME is current |
| 35 |
shutil.copyfile(metadata_dtd, os.path.join(distdir, "metadata.dtd")) |
| 36 |
for cwd in ("", "dev-libs", "dev-libs/A", "dev-libs/B"): |
| 37 |
- cwd = os.path.join(portdir, cwd) |
| 38 |
+ abs_cwd = os.path.join(portdir, cwd) |
| 39 |
proc = subprocess.Popen([portage._python_interpreter, "-Wd", |
| 40 |
os.path.join(PORTAGE_BIN_PATH, "repoman"), "full"], |
| 41 |
- cwd=cwd, env=env, stdout=subprocess.PIPE) |
| 42 |
+ cwd=abs_cwd, env=env, stdout=subprocess.PIPE) |
| 43 |
output = proc.stdout.readlines() |
| 44 |
proc.wait() |
| 45 |
proc.stdout.close() |
| 46 |
@@ -169,6 +169,7 @@ class SimpleRepomanTestCase(TestCase): |
| 47 |
for line in output: |
| 48 |
sys.stderr.write(_unicode_decode(line)) |
| 49 |
|
| 50 |
- self.assertEqual(os.EX_OK, proc.returncode, "repoman failed") |
| 51 |
+ self.assertEqual(os.EX_OK, proc.returncode, |
| 52 |
+ "repoman failed in %s" % (cwd,)) |
| 53 |
finally: |
| 54 |
playground.cleanup() |
Archives