[gentoo-commits] proj/pms-test-suite:master commit in: pmstestsuite/library/standard/

["Michał Górny" <mgorny@gentoo.org>]

commit:     745fa6c3eedb4a855d9467fd2f59885c51428bb5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  6 14:14:39 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 14:14:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=745fa6c3

Banned commands: cleanly handle undefined & unexpected results.

---
 pmstestsuite/library/standard/banned_commands.py |   24 ++++++++++++++++-----
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/pmstestsuite/library/standard/banned_commands.py b/pmstestsuite/library/standard/banned_commands.py
index 914b691..4438f12 100644
--- a/pmstestsuite/library/standard/banned_commands.py
+++ b/pmstestsuite/library/standard/banned_commands.py
@@ -31,9 +31,15 @@ class DoHardCommandTest(BannedCommandTest):
 		try:
 			BannedCommandTest.check_dbus_result(self, output, pm)
 		finally:
-			# XXX: ambiguous in EAPI 4
-			if output:
-				self.assertTrue(output[0] == '0', 'hardlink created')
+			try:
+				res = True if output[0] == '0' else False
+			except IndexError:
+				res = None
+			if self.eapi < 4:
+				self.assertTrue(res, 'hardlink created')
+			else:
+				self.assertFalse(res, 'hardlink created',
+						undefined = True)
 
 class DoSedCommandTest(BannedCommandTest):
 	""" Test whether dosed command is actually banned. """
@@ -48,6 +54,12 @@ class DoSedCommandTest(BannedCommandTest):
 		try:
 			BannedCommandTest.check_dbus_result(self, output, pm)
 		finally:
-			# XXX: ambiguous in EAPI 4
-			if output:
-				self.assertEqual(output[0].strip(), 'SED WORKED', 'dosed result')
+			try:
+				res = output[0].strip()
+			except IndexError:
+				res = None
+			if self.eapi < 4:
+				self.assertEqual(res, 'SED WORKED', 'dosed result')
+			else:
+				self.assertNotEqual(res, 'SED WORKED', 'dosed result',
+						undefined = True)