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

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

commit:     e9d3a675ab2e8aa3438e6918ffda30f18fed1992
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 17 13:50:41 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 13:50:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=e9d3a675

Add a D-Bus variant of dependency test case.

---
 PMSTestSuite/library/standard/basic/depend.py |   11 ++++----
 PMSTestSuite/library/standard/dbus_case.py    |   33 +++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/PMSTestSuite/library/standard/basic/depend.py b/PMSTestSuite/library/standard/basic/depend.py
index ef832a0..c91a107 100644
--- a/PMSTestSuite/library/standard/basic/depend.py
+++ b/PMSTestSuite/library/standard/basic/depend.py
@@ -2,8 +2,7 @@
 # (c) 2011 Michał Górny <mgorny@gentoo.org>
 # Released under the terms of the 2-clause BSD license.
 
-from PMSTestSuite.library.standard.dbus_case import DBusEbuildTestCase
-from PMSTestSuite.library.depend_case import EbuildDependencyTestCase
+from PMSTestSuite.library.standard.dbus_case import DBusEbuildTestCase, DBusEbuildDependencyTestCase
 
 class EbuildToucher(DBusEbuildTestCase):
 	""" Touched file installer (for dependency tests). """
@@ -24,26 +23,26 @@ _EOF_'''
 			'newbin mytrue.sh pms-test-suite-%s || die' % self.pv
 		)
 
-class DependTest(EbuildDependencyTestCase):
+class DependTest(DBusEbuildDependencyTestCase):
 	""" DEPEND fulfilling test. """
 
 	relevant_eapis = (0,)
 	depend_classes = [EbuildToucher]
 
 	def __init__(self, *args, **kwargs):
-		EbuildDependencyTestCase.__init__(self, *args, **kwargs)
+		DBusEbuildDependencyTestCase.__init__(self, *args, **kwargs)
 		self.phase_funcs['src_compile'].append(
 			'pms-test-suite-%s || die' % self.depend_objs[0].pv
 		)
 		
-class RDependTest(EbuildDependencyTestCase):
+class RDependTest(DBusEbuildDependencyTestCase):
 	""" RDEPEND fulfilling test. """
 
 	relevant_eapis = (0,)
 	rdepend_classes = [EbuildToucher]
 
 	def __init__(self, *args, **kwargs):
-		EbuildDependencyTestCase.__init__(self, *args, **kwargs)
+		DBusEbuildDependencyTestCase.__init__(self, *args, **kwargs)
 		self.phase_funcs['pkg_postinst'].append(
 			'pms-test-suite-%s || die' % self.rdepend_objs[0].pv
 		)

diff --git a/PMSTestSuite/library/standard/dbus_case.py b/PMSTestSuite/library/standard/dbus_case.py
index 970c897..d67c11b 100644
--- a/PMSTestSuite/library/standard/dbus_case.py
+++ b/PMSTestSuite/library/standard/dbus_case.py
@@ -5,6 +5,8 @@
 import dbus.service
 
 from PMSTestSuite.library.case import EbuildTestCase
+from PMSTestSuite.library.depend_case import EbuildDependencyTestCase
+
 from PMSTestSuite.dbus_handler import DBusHandler, dbus_interface_name, dbus_object_prefix
 
 dbus_handler = DBusHandler()
@@ -103,3 +105,34 @@ class DBusEbuildTestCase(EbuildTestCase):
 	def check_result(self, pm):
 		return self.dbus_started \
 			and self.check_dbus_result('\n'.join(self.dbus_output), pm)
+
+class DBusEbuildDependencyTestCase(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')
+
+	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):
+		return self.dbus_started \
+			and self.check_dbus_result('\n'.join(self.dbus_output), pm)