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

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

commit:     dd2fa7259ef32b24afcc06d7408b380311e094ab
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  3 16:51:15 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 16:51:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=dd2fa725

Commonize some of D-Bus test cases code.

---
 pmstestsuite/library/standard/dbus_case.py |   85 +++++++---------------------
 1 files changed, 21 insertions(+), 64 deletions(-)

diff --git a/pmstestsuite/library/standard/dbus_case.py b/pmstestsuite/library/standard/dbus_case.py
index e69e4de..eb88fa1 100644
--- a/pmstestsuite/library/standard/dbus_case.py
+++ b/pmstestsuite/library/standard/dbus_case.py
@@ -77,14 +77,12 @@ class RunningTest(dbus.service.Object):
 		""" Append the line <l> to the test output. """
 		self.test.dbus_output.append(l)
 
-class DBusEbuildTestCase(EbuildTestCase):
-	""" D-Bus capable base test case. """
+class DBusBaseTestCase(object):
+	""" A base D-Bus test case class. """
 
 	inherits = ['pms-test-dbus']
 
-	def __init__(self, *args, **kwargs):
-		""" Initialize the test case and the D-Bus object for it. """
-		EbuildTestCase.__init__(self, *args, **kwargs)
+	def __init__(self):
 		self._dbusobj = RunningTest(self)
 
 	def _finalize(self):
@@ -102,68 +100,43 @@ class DBusEbuildTestCase(EbuildTestCase):
 		The default implementation simply checks whether the test was merged
 		alike EbuildTestCase.check_result().
 		"""
-		return EbuildTestCase.check_result(self, pm)
+		pass
 
 	def check_result(self, 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. """
-
-	inherits = ['pms-test-dbus']
+class DBusEbuildTestCase(DBusBaseTestCase, EbuildTestCase):
+	""" D-Bus capable base test case. """
 
 	def __init__(self, *args, **kwargs):
 		""" Initialize the test case and the D-Bus object for it. """
-		EclassTestCase.__init__(self, *args, **kwargs)
-		self._dbusobj = RunningTest(self)
-
-	def _finalize(self):
-		""" Finalize the object, ensuring pkg_setup() will be called. """
-		if self.phase_funcs['pkg_setup']:
-			self.phase_funcs['pkg_setup'].insert(0, 'pms-test-dbus_pkg_setup')
+		EbuildTestCase.__init__(self, *args, **kwargs)
+		DBusBaseTestCase.__init__(self)
 
 	def check_dbus_result(self, output, pm):
-		"""
-		Check whether the <output> sent through D-Bus matches expected test
-		output.
+		return EbuildTestCase.check_result(self, pm)
 
-		Return True if it does, False otherwise.
+class DBusEclassTestCase(DBusBaseTestCase, EclassTestCase):
+	""" D-Bus capable eclass test case. """
 
-		The default implementation simply checks whether the test was merged
-		alike EbuildTestCase.check_result().
-		"""
-		return EbuildTestCase.check_result(self, pm)
+	def __init__(self, *args, **kwargs):
+		""" Initialize the test case and the D-Bus object for it. """
+		EclassTestCase.__init__(self, *args, **kwargs)
+		DBusBaseTestCase.__init__(self)
 
-	def check_result(self, pm):
-		self.assertTrue(self.dbus_started, 'build started')
-		return self.check_dbus_result('\n'.join(self.dbus_output), pm)
+	def check_dbus_result(self, output, pm):
+		return EclassTestCase.check_result(self, pm)
 
-class DBusEbuildDependencyTestCase(EbuildDependencyTestCase):
+class DBusEbuildDependencyTestCase(DBusBaseTestCase, EbuildDependencyTestCase):
 	""" D-Bus capable dependency test case. """
 
-	inherits = ['pms-test-dbus']
-
 	def __init__(self, *args, **kwargs):
 		""" Initialize the test case and the D-Bus object for it. """
 		EbuildDependencyTestCase.__init__(self, *args, **kwargs)
-		self._dbusobj = RunningTest(self)
-
-	def _finalize(self):
-		""" Finalize the object, ensuring pkg_setup() will be called. """
-		if self.phase_funcs['pkg_setup']:
-			self.phase_funcs['pkg_setup'].insert(0, 'pms-test-dbus_pkg_setup')
+		DBusBaseTestCase.__init__(self)
 
 	def check_dbus_result(self, output, pm):
-		"""
-		Check whether the <output> sent through D-Bus matches expected test
-		output.
-
-		Return True if it does, False otherwise.
-
-		The default implementation simply checks whether the test was merged
-		alike EbuildDependencyTestCase.check_result().
-		"""
 		return EbuildDependencyTestCase.check_result(self, pm)
 
 	def check_result(self, pm):
@@ -171,31 +144,15 @@ class DBusEbuildDependencyTestCase(EbuildDependencyTestCase):
 				'build started')
 		return self.check_dbus_result('\n'.join(self.dbus_output), pm)
 
-class DBusEclassDependencyTestCase(EclassDependencyTestCase):
+class DBusEclassDependencyTestCase(DBusBaseTestCase, EclassDependencyTestCase):
 	""" D-Bus capable eclass dependency test case. """
 
-	inherits = ['pms-test-dbus']
-
 	def __init__(self, *args, **kwargs):
 		""" Initialize the test case and the D-Bus object for it. """
 		EclassDependencyTestCase.__init__(self, *args, **kwargs)
-		self._dbusobj = RunningTest(self)
-
-	def _finalize(self):
-		""" Finalize the object, ensuring pkg_setup() will be called. """
-		if self.phase_funcs['pkg_setup']:
-			self.phase_funcs['pkg_setup'].insert(0, 'pms-test-dbus_pkg_setup')
+		DBusBaseTestCase.__init__(self)
 
 	def check_dbus_result(self, output, pm):
-		"""
-		Check whether the <output> sent through D-Bus matches expected test
-		output.
-
-		Return True if it does, False otherwise.
-
-		The default implementation simply checks whether the test was merged
-		alike EclassDependencyTestCase.check_result().
-		"""
 		return EclassDependencyTestCase.check_result(self, pm)
 
 	def check_result(self, pm):