summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2017-04-12 11:17:42 +0200
committerBastien Nocera <hadess@hadess.net>2017-04-12 11:17:42 +0200
commitf581667b187b38ff45f27e6eba62f30482fba1ee (patch)
treeed4a60cb4c8fdf5db59d254e93ee8eb5a30f808c /tests
parentcaa177a7f2f58fc74b2f52ef2eeeced9f320d405 (diff)
downloadgnome-settings-daemon-f581667b187b38ff45f27e6eba62f30482fba1ee.tar.gz
tests: Use existing logind template
Rather than creating our own.
Diffstat (limited to 'tests')
-rw-r--r--tests/gsdtestcase.py22
1 files changed, 4 insertions, 18 deletions
diff --git a/tests/gsdtestcase.py b/tests/gsdtestcase.py
index ed0a0a07..d7d310c3 100644
--- a/tests/gsdtestcase.py
+++ b/tests/gsdtestcase.py
@@ -151,26 +151,12 @@ class GSDTestCase(dbusmock.DBusTestCase):
klass.monitor_log.flush()
klass.monitor_log.close()
- def start_logind(self):
+ def start_logind(self, parameters=None):
'''start mock logind'''
- self.logind = self.spawn_server('org.freedesktop.login1',
- '/org/freedesktop/login1',
- 'org.freedesktop.login1.Manager',
- system_bus=True,
- stdout=subprocess.PIPE)
- self.obj_logind = self.system_bus_con.get_object(
- 'org.freedesktop.login1', '/org/freedesktop/login1')
-
- self.obj_logind.AddMethods('',
- [
- ('PowerOff', 'b', '', ''),
- ('Suspend', 'b', '', ''),
- ('Hibernate', 'b', '', ''),
- ('Inhibit', 'ssss', 'h', 'ret = 5'),
- ('CanSuspend', '', 's', "ret = 'yes'"),
- ('CanHibernate', '', 's', "ret = 'no'")
- ], dbus_interface='org.freedesktop.DBus.Mock')
+ self.logind, self.logind_obj = self.spawn_server_template('logind',
+ parameters or {},
+ stdout=subprocess.PIPE)
# set log to nonblocking
set_nonblock(self.logind.stdout)