diff options
Diffstat (limited to 'pmstestsuite/library/standard/dbus_case.py')
| -rw-r--r-- | pmstestsuite/library/standard/dbus_case.py | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/pmstestsuite/library/standard/dbus_case.py b/pmstestsuite/library/standard/dbus_case.py index 6bfbd88..672ace5 100644 --- a/pmstestsuite/library/standard/dbus_case.py +++ b/pmstestsuite/library/standard/dbus_case.py @@ -13,40 +13,6 @@ from pmstestsuite.dbus_handler import DBusHandler, dbus_interface_name, dbus_obj dbus_handler = DBusHandler() -pms_dbus_eclass = """# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -DEPEND="sys-apps/dbus" - -EXPORT_FUNCTIONS pkg_setup - -pms-test-dbus_call() { - local method=${1} - shift - - PMS_TEST_DBUS_P=${P//-/_} - dbus-send \\ - --system \\ - --print-reply \\ - --type=method_call \\ - --dest=org.gentoo.pmstestsuite \\ - /org/gentoo/pmstestsuite/${PMS_TEST_DBUS_P} \\ - org.gentoo.pmstestsuite.${method} \\ - "${@}" -} - -pms-test-dbus_pkg_setup() { - pms-test-dbus_call test_started -} - -pms-test-dbus_append_result() { - pms-test-dbus_call append_output \\ - string:"${*}" \\ - || die 'Failed to append the test result using dbus' -} -""" - class RunningTest(dbus.service.Object): """ A class encapsulating a running test. """ @@ -96,8 +62,6 @@ class RunningTest(dbus.service.Object): class DBusBaseTestCase(object): """ A base D-Bus test case class. """ - inherits = ['pms-test-dbus'] - def __init__(self): self._dbusobj = RunningTest(self) @@ -106,7 +70,7 @@ class DBusBaseTestCase(object): Finalize the object, ensuring that C{pkg_setup()} will be called. """ if self.phase_funcs['pkg_setup']: - self.phase_funcs['pkg_setup'].insert(0, 'pms-test-dbus_pkg_setup') + self.phase_funcs['pkg_setup'].insert(0, 'pms-test_pkg_setup') def check_dbus_result(self, output, pm): """ |