From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QSYIy-0002hH-H5 for garchives@archives.gentoo.org; Fri, 03 Jun 2011 17:37:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C1EF1C125; Fri, 3 Jun 2011 17:36:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2AF5B1C125 for ; Fri, 3 Jun 2011 17:36:42 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AB8BB1B4033 for ; Fri, 3 Jun 2011 17:36:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0CF3880506 for ; Fri, 3 Jun 2011 17:36:41 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: Subject: [gentoo-commits] proj/pms-test-suite:master commit in: PMSTestSuite/library/standard/, PMSTestSuite/ X-VCS-Repository: proj/pms-test-suite X-VCS-Files: PMSTestSuite/dbus_handler.py PMSTestSuite/library/standard/dbus_case.py X-VCS-Directories: PMSTestSuite/library/standard/ PMSTestSuite/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: fba9e6ada39b2f93715d2e1843ccf219b3ca6951 Date: Fri, 3 Jun 2011 17:36:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 3a5bfd56a612a50ef3253de8eb84d848 commit: fba9e6ada39b2f93715d2e1843ccf219b3ca6951 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Fri Jun 3 16:47:52 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Fri Jun 3 16:47:52 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pms-test-suit= e.git;a=3Dcommit;h=3Dfba9e6ad Move RunningTest to ...library.standard.dbus_case. --- PMSTestSuite/dbus_handler.py | 28 +---------------------= ------ PMSTestSuite/library/standard/dbus_case.py | 28 ++++++++++++++++++++++= ++++-- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/PMSTestSuite/dbus_handler.py b/PMSTestSuite/dbus_handler.py index b4b3e4b..ddacb6b 100644 --- a/PMSTestSuite/dbus_handler.py +++ b/PMSTestSuite/dbus_handler.py @@ -2,34 +2,12 @@ # (c) 2011 Micha=C5=82 G=C3=B3rny # Released under the terms of the 2-clause BSD license. =20 -import dbus, dbus.service +import dbus from dbus.mainloop.glib import DBusGMainLoop =20 dbus_interface_name =3D 'org.gentoo.PMSTestSuite' dbus_object_prefix =3D '/org/gentoo/PMSTestSuite' =20 -class RunningTest(dbus.service.Object): - """ A class encapsulating a running test. """ - - def __init__(self, test, parent): - """ - Initialize the object for test , for DBusHandler . - """ - self.test =3D test - self.test.dbus_output =3D [] - dbus.service.Object.__init__( - self, - parent.bus, - '%s/%s' % (dbus_object_prefix, test.p.replace('-', '_')) - ) - - @dbus.service.method( - dbus_interface=3Ddbus_interface_name, - in_signature=3D's', out_signature=3D'') - def append_output(self, l): - """ Append the line to the test output. """ - self.test.dbus_output.append(l) - class DBusHandler(object): """ A class handling all D-Bus interaction for PMS Test Suite. """ =20 @@ -38,7 +16,3 @@ class DBusHandler(object): DBusGMainLoop(set_as_default=3DTrue) self.bus =3D dbus.SystemBus() self.busname =3D dbus.service.BusName(dbus_interface_name, self.bus) - - def add_test(self, test): - """ Add the object for to the handler. """ - test._dbusobj =3D RunningTest(test, self) diff --git a/PMSTestSuite/library/standard/dbus_case.py b/PMSTestSuite/li= brary/standard/dbus_case.py index 5769304..08778fa 100644 --- a/PMSTestSuite/library/standard/dbus_case.py +++ b/PMSTestSuite/library/standard/dbus_case.py @@ -2,18 +2,42 @@ # (c) 2011 Micha=C5=82 G=C3=B3rny # Released under the terms of the 2-clause BSD license. =20 +import dbus.service + from PMSTestSuite.library.case import EbuildTestCase -from PMSTestSuite.dbus_handler import DBusHandler, RunningTest +from PMSTestSuite.dbus_handler import DBusHandler, dbus_interface_name, = dbus_object_prefix =20 dbus_handler =3D DBusHandler() =20 +class RunningTest(dbus.service.Object): + """ A class encapsulating a running test. """ + + def __init__(self, test): + """ + Initialize the D-Bus object for test . + """ + self.test =3D test + self.test.dbus_output =3D [] + dbus.service.Object.__init__( + self, + dbus_handler.bus, + '%s/%s' % (dbus_object_prefix, test.p.replace('-', '_')) + ) + + @dbus.service.method( + dbus_interface=3Ddbus_interface_name, + in_signature=3D's', out_signature=3D'') + def append_output(self, l): + """ Append the line to the test output. """ + self.test.dbus_output.append(l) + class DBusEbuildTestCase(EbuildTestCase): """ D-Bus capable base test case. """ =20 def __init__(self, *args, **kwargs): """ Initialize the test case and the D-Bus object for it. """ EbuildTestCase.__init__(self, *args, **kwargs) - dbus_handler.add_test(self) + self._dbusobj =3D RunningTest(self) =20 def check_result(self, res): return self.check_output('\n'.join(self.dbus_output))