[gnome-settings-daemon] tests: Use existing logind template
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] tests: Use existing logind template
- Date: Wed, 12 Apr 2017 09:18:56 +0000 (UTC)
commit f581667b187b38ff45f27e6eba62f30482fba1ee
Author: Bastien Nocera <hadess hadess net>
Date: Wed Apr 12 11:17:42 2017 +0200
tests: Use existing logind template
Rather than creating our own.
tests/gsdtestcase.py | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/tests/gsdtestcase.py b/tests/gsdtestcase.py
index ed0a0a0..d7d310c 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]