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

[Michał Górny]

commit:     20a517879090c82a402085491b6846549fd6c718
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 18:16:37 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 29 18:16:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=20a51787

Add a minimal D-Bus module.

---
 PMSTestSuite/dbus.py                               |   43 ++++++++++++++++++++
 dbus-listener/test-listener.py                     |   26 ------------
 ...STestSuite.conf => org.gentoo.PMSTestSuite.conf |    0
 3 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/PMSTestSuite/dbus.py b/PMSTestSuite/dbus.py
new file mode 100644
index 0000000..f19c098
--- /dev/null
+++ b/PMSTestSuite/dbus.py
@@ -0,0 +1,43 @@
+#	vim:fileencoding=utf-8
+# (c) 2011 Michał Górny <mgorny@g.o>
+# Released under the terms of the 2-clause BSD license.
+
+import dbus, dbus.service
+from dbus.mainloop.glib import DBusGMainLoop
+
+dbus_interface_name = 'org.gentoo.PMSTestSuite'
+dbus_object_prefix = '/org/gentoo/PMSTestSuite'
+
+class RunningTest(dbus.service.Object):
+	""" A class encapsulating a running test. """
+
+	def __init__(self, test_name, parent):
+		"""
+		Initialize the object for test <test_name>, for DBusHandler <parent>.
+		"""
+		self.test_name = test_name
+		self.output = []
+		dbus.service.Object.__init__(
+				parent.bus,
+				'%s/%s' % (dbus_object_prefix, test_name)
+		)
+
+	@dbus.service.method(
+			dbus_interface=dbus_interface_name,
+			in_signature='ss', out_signature='')
+	def append_output(self, l):
+		""" Append the line <l> to the test output. """
+		self.output.append(l)
+
+class DBusHandler(object):
+	""" A class handling all D-Bus interaction for PMS Test Suite. """
+
+	def __init__(self):
+		""" Initialize DBusHandler. Add it to main GLib loop. """
+		DBusGMainLoop(set_as_default=True)
+		self.bus = dbus.SystemBus()
+		self.busname = dbus.service.BusName(dbus_interface_name, self.bus)
+
+	def add_test(self, test):
+		""" Add the object for <test> to the handler. """
+		test._dbusobj = RunningTest(test.pn, self)

diff --git a/dbus-listener/test-listener.py b/dbus-listener/test-listener.py
deleted file mode 100755
index 22a0c89..0000000
--- a/dbus-listener/test-listener.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/python
-
-import sys
-
-import dbus, dbus.mainloop.glib, dbus.service
-import gobject
-
-class PMSTestSuite(dbus.service.Object):
-	@dbus.service.method(
-			dbus_interface='org.gentoo.PMSTestSuite',
-			in_signature='ss', out_signature='')
-	def append_output(self, test_name, l):
-		print('%s: %s' % (test_name, l))
-
-def main(argv):
-	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-	bus = dbus.SystemBus()
-
-	bname = dbus.service.BusName("org.gentoo.PMSTestSuite", bus)
-	obj = PMSTestSuite(bus, '/org/gentoo/PMSTestSuite')
-
-	loop = gobject.MainLoop()
-	loop.run()
-
-if __name__ == '__main__':
-	main(sys.argv[1:])

diff --git a/dbus-listener/org.gentoo.PMSTestSuite.conf b/org.gentoo.PMSTestSuite.conf
similarity index 100%
rename from dbus-listener/org.gentoo.PMSTestSuite.conf
rename to org.gentoo.PMSTestSuite.conf