| 1 |
commit: 980fe4c9237ff98ba4cb165854831d56b2ffc39c |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 3 17:07:03 2012 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 3 17:07:03 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=980fe4c9 |
| 7 |
|
| 8 |
Fix test code. |
| 9 |
|
| 10 |
--- |
| 11 |
pmstestsuite/library/standard/banned_commands.py | 9 +++------ |
| 12 |
1 files changed, 3 insertions(+), 6 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pmstestsuite/library/standard/banned_commands.py b/pmstestsuite/library/standard/banned_commands.py |
| 15 |
index 7e3de17..5ddc80f 100644 |
| 16 |
--- a/pmstestsuite/library/standard/banned_commands.py |
| 17 |
+++ b/pmstestsuite/library/standard/banned_commands.py |
| 18 |
@@ -36,12 +36,12 @@ class DoHardCommandTest(BannedCommandTest): |
| 19 |
except IndexError: |
| 20 |
res = None |
| 21 |
|
| 22 |
+ exc = None |
| 23 |
if self.eapi < 4: |
| 24 |
try: |
| 25 |
self.assertTrue(res, 'hardlink created') |
| 26 |
except AssertionError as e: |
| 27 |
- if exc is None: |
| 28 |
- exc = e |
| 29 |
+ exc = e |
| 30 |
try: |
| 31 |
self.assertTrue(output[1] == '0', 'hardlink preserved after merge', |
| 32 |
undefined = True) |
| 33 |
@@ -76,9 +76,6 @@ class DoSedCommandTest(BannedCommandTest): |
| 34 |
|
| 35 |
if self.eapi < 4: |
| 36 |
self.assertEqual(res, 'SED WORKED', 'dosed result') |
| 37 |
- elif res is not None or exc: |
| 38 |
+ elif res is not None: |
| 39 |
self.assertNotEqual(res, 'SED WORKED', 'dosed result', |
| 40 |
undefined = True) |
| 41 |
- |
| 42 |
- if exc: |
| 43 |
- raise exc |
Archives