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

[Michał Górny]

commit:     079c4be9ec9753ae426a3935af6b4a53f3c49556
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 17:13:11 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 17:13:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=079c4be9

Introduce asserts for test cases.

---
 pmstestsuite/cli.py                        |   18 +++++++-
 pmstestsuite/library/case.py               |   68 +++++++++++++++++++++++++++-
 pmstestsuite/library/standard/dbus_case.py |   18 ++++---
 3 files changed, 93 insertions(+), 11 deletions(-)

diff --git a/pmstestsuite/cli.py b/pmstestsuite/cli.py
index 518d826..892b8ab 100644
--- a/pmstestsuite/cli.py
+++ b/pmstestsuite/cli.py
@@ -111,7 +111,7 @@ class PMSTestSuiteCLI(object):
 
 		self.pm.package_limit = opts.limit_pkgs
 		self.update_manifests = not opts.no_manifests
-		
+
 		limit_tests = set()
 		for t in opts.tests:
 			limit_tests.update(t.split())
@@ -121,8 +121,17 @@ class PMSTestSuiteCLI(object):
 	def tests_done(self):
 		print('-> Checking test results...')
 		self.failed = []
+		self.asserts = [] # temporary
 		for t in self.test_library:
-			res = t.check_result(self.pm)
+			try:
+				res = t.check_result(self.pm)
+			except AssertionError as e:
+				res = False
+				self.asserts.append(str(e))
+			else:
+				# forward compat
+				if res is None:
+					res = True
 			if not res:
 				self.failed.append(t)
 			t.clean(self.pm)
@@ -143,6 +152,11 @@ class PMSTestSuiteCLI(object):
 			for t in self.failed:
 				print('- %s' % t)
 
+		if self.asserts:
+			print('[DEBUG] asserts:')
+			for a in self.asserts:
+				print('- %s' % a)
+
 		self.ret = 0 if not self.failed else 1
 		self.loop.quit()
 

diff --git a/pmstestsuite/library/case.py b/pmstestsuite/library/case.py
index 3f5d31e..0dd64b8 100644
--- a/pmstestsuite/library/case.py
+++ b/pmstestsuite/library/case.py
@@ -102,6 +102,70 @@ class TestCase(ABCObject):
 		"""
 		pass
 
+	def assertTrue(self, cond, msg):
+		"""
+		Assert that the condition evaluates to True.
+
+		@param cond: the condition
+		@type cond: bool
+		@param msg: assertion description
+		@type msg: string
+		"""
+		self.assertBool(True, cond, msg)
+
+	def assertFalse(self, cond, msg):
+		"""
+		Assert that the condition evaluates to False.
+
+		@param cond: the condition
+		@type cond: bool
+		@param msg: assertion description
+		@type msg: string
+		"""
+		self.assertBool(False, cond, msg)
+
+	def assertBool(self, expect, cond, msg):
+		"""
+		Assert that the condition evaluates to expected boolean result.
+
+		@param expect: expected result
+		@type expect: bool
+		@param cond: the condition
+		@type cond: bool
+		@param msg: assertion description
+		@type msg: string
+		"""
+		if bool(cond) != expect:
+			raise AssertionError(msg)
+
+	def assertTrue(self, cond, msg):
+		"""
+		Assert that the condition evaluates to True.
+
+		@param cond: the condition
+		@type cond: bool
+		@param msg: assertion description
+		@type msg: string
+		"""
+		if not cond:
+			raise AssertionError(msg)
+
+	def assertContains(self, needle, container, msg = None):
+		"""
+		Assert the following condition: C{needle in container}.
+
+		@param needle: the needle to look for
+		@type needle: any
+		@param container: the container to look for needle in
+		@type container: iterable
+		@param msg: assertion description or C{None} for default one
+		@type msg: string/C{None}
+		"""
+		if msg is None:
+			msg = '%s in %s' % (repr(needle), repr(container))
+		if needle not in container:
+			raise AssertionError(msg)
+
 	@abstractmethod
 	def check_result(self, pm):
 		"""
@@ -303,4 +367,6 @@ class EbuildTestCase(TestCase):
 		"""
 
 		merged = self.atom(pm) in pm.installed
-		return (merged != self.expect_failure)
+		self.assertBool(not self.expect_failure, merged,
+				'package merged')
+		return True

diff --git a/pmstestsuite/library/standard/dbus_case.py b/pmstestsuite/library/standard/dbus_case.py
index 8bc1c99..e69e4de 100644
--- a/pmstestsuite/library/standard/dbus_case.py
+++ b/pmstestsuite/library/standard/dbus_case.py
@@ -105,8 +105,8 @@ class DBusEbuildTestCase(EbuildTestCase):
 		return EbuildTestCase.check_result(self, pm)
 
 	def check_result(self, pm):
-		return self.dbus_started \
-			and self.check_dbus_result('\n'.join(self.dbus_output), pm)
+		self.assertTrue(self.dbus_started, 'build started')
+		return self.check_dbus_result('\n'.join(self.dbus_output), pm)
 
 class DBusEclassTestCase(EclassTestCase):
 	""" D-Bus capable eclass test case. """
@@ -136,8 +136,8 @@ class DBusEclassTestCase(EclassTestCase):
 		return EbuildTestCase.check_result(self, pm)
 
 	def check_result(self, pm):
-		return self.dbus_started \
-			and self.check_dbus_result('\n'.join(self.dbus_output), pm)
+		self.assertTrue(self.dbus_started, 'build started')
+		return self.check_dbus_result('\n'.join(self.dbus_output), pm)
 
 class DBusEbuildDependencyTestCase(EbuildDependencyTestCase):
 	""" D-Bus capable dependency test case. """
@@ -167,8 +167,9 @@ class DBusEbuildDependencyTestCase(EbuildDependencyTestCase):
 		return EbuildDependencyTestCase.check_result(self, pm)
 
 	def check_result(self, pm):
-		return self.dbus_started != self.expect_failure \
-			and self.check_dbus_result('\n'.join(self.dbus_output), pm)
+		self.assertBool(not self.expect_failure, self.dbus_started,
+				'build started')
+		return self.check_dbus_result('\n'.join(self.dbus_output), pm)
 
 class DBusEclassDependencyTestCase(EclassDependencyTestCase):
 	""" D-Bus capable eclass dependency test case. """
@@ -198,5 +199,6 @@ class DBusEclassDependencyTestCase(EclassDependencyTestCase):
 		return EclassDependencyTestCase.check_result(self, pm)
 
 	def check_result(self, pm):
-		return self.dbus_started != self.expect_failure \
-			and self.check_dbus_result('\n'.join(self.dbus_output), pm)
+		self.assertBool(not self.expect_failure, self.dbus_started,
+				'build started')
+		return self.check_dbus_result('\n'.join(self.dbus_output), pm)