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

[Michał Górny]

commit:     84dc3edc91e0e74fc0725841b7b335fafe641e48
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 16:58:18 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 31 16:59:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=84dc3edc

Support checking whether the tests have been merged.

---
 PMSTestSuite/library/case.py             |   21 ++++++++++++++++++++-
 PMSTestSuite/library/test/random_test.py |    1 +
 PMSTestSuite/testrunner.py               |   19 +++++++++++++++++--
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/PMSTestSuite/library/case.py b/PMSTestSuite/library/case.py
index 103d822..f02a5e1 100644
--- a/PMSTestSuite/library/case.py
+++ b/PMSTestSuite/library/case.py
@@ -46,7 +46,16 @@ class TestCase(object):
 	pass
 
 class EbuildTestCase(TestCase):
-	""" Test case using a single ebuild (per EAPI). """
+	"""
+	Test case using a single ebuild (per EAPI).
+	
+	Properties:
+	- expect_failure - if set to False (the default), the test is supposed
+		to merge successfully. Otherwise, the test ebuild is supposed to fail
+		to merge (die).
+	"""
+
+	expect_failure = False
 
 	@classmethod
 	def inst_all(cls, *args, **kwargs):
@@ -102,3 +111,13 @@ class EbuildTestCase(TestCase):
 		fn = 'pms-test/%s/%s.ebuild' % (self.pn, self.p)
 
 		return {fn: EbuildTestCaseEbuildFile(self)}
+
+	def check_result(self, merged):
+		"""
+		Check the correctness of the result of test execution. <merged> should
+		indicate whether the ebuild was actually merged.
+
+		Returns True if the results indicate that the test succeeded, False
+		otherwise.
+		"""
+		return (merged != self.expect_failure)

diff --git a/PMSTestSuite/library/test/random_test.py b/PMSTestSuite/library/test/random_test.py
index d60c32d..088bda5 100644
--- a/PMSTestSuite/library/test/random_test.py
+++ b/PMSTestSuite/library/test/random_test.py
@@ -10,6 +10,7 @@ class RandomExampleTest(EbuildTestCase):
 	"""
 
 	relevant_eapis = (0, 1, 2, 4)
+	expect_failure = True
 
 	ebuild_vars = {
 		'DESCRIPTION': 'A really random test'

diff --git a/PMSTestSuite/testrunner.py b/PMSTestSuite/testrunner.py
index 8ac4d6e..f642aaa 100644
--- a/PMSTestSuite/testrunner.py
+++ b/PMSTestSuite/testrunner.py
@@ -4,8 +4,23 @@ import gobject
 
 class TestRunnerCLI(EbuildGenCLI):
 	def merge_done(self, pid, ret):
-		print(self.pm.lookup_vardb(self.cpvs))
-		self.ret = 0
+		failed = []
+
+		cpvs = frozenset(self.pm.lookup_vardb(self.cpvs))
+		for t in self.test_library:
+			res = t.check_result(t.p in cpvs)
+			if not res:
+				failed.append(t)
+
+		if not failed:
+			print('%d tests completed successfully.' % len(self.cpvs))
+		else:
+			print('%d of %d tests completed successfully, %d failed:'
+					% (len(self.cpvs) - len(failed), len(self.cpvs), len(failed)))
+			for t in failed:
+				print('- %s' % t.p)
+
+		self.ret = 0 if not failed else 1
 		self.loop.quit()
 
 	def main(self, argv):