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

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

commit:     6c74f6434db0c985c7c0b0afaec7227e4e5f139c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 17:12:36 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 31 17:17:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=6c74f643

Use actual tests in dbus_handler.

---
 PMSTestSuite/dbus_handler.py |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/PMSTestSuite/dbus_handler.py b/PMSTestSuite/dbus_handler.py
index f19c098..89e2ac5 100644
--- a/PMSTestSuite/dbus_handler.py
+++ b/PMSTestSuite/dbus_handler.py
@@ -11,23 +11,23 @@ dbus_object_prefix = '/org/gentoo/PMSTestSuite'
 class RunningTest(dbus.service.Object):
 	""" A class encapsulating a running test. """
 
-	def __init__(self, test_name, parent):
+	def __init__(self, test, parent):
 		"""
-		Initialize the object for test <test_name>, for DBusHandler <parent>.
+		Initialize the object for test <test>, for DBusHandler <parent>.
 		"""
-		self.test_name = test_name
-		self.output = []
+		self.test = test
 		dbus.service.Object.__init__(
+				self,
 				parent.bus,
-				'%s/%s' % (dbus_object_prefix, test_name)
+				'%s/%s' % (dbus_object_prefix, test.p.replace('-', '_'))
 		)
 
 	@dbus.service.method(
 			dbus_interface=dbus_interface_name,
-			in_signature='ss', out_signature='')
+			in_signature='s', out_signature='')
 	def append_output(self, l):
 		""" Append the line <l> to the test output. """
-		self.output.append(l)
+		self.test.dbus_output.append(l)
 
 class DBusHandler(object):
 	""" A class handling all D-Bus interaction for PMS Test Suite. """
@@ -40,4 +40,4 @@ class DBusHandler(object):
 
 	def add_test(self, test):
 		""" Add the object for <test> to the handler. """
-		test._dbusobj = RunningTest(test.pn, self)
+		test._dbusobj = RunningTest(test, self)