diff options
| author | Benjamin Berg <bberg@redhat.com> | 2018-04-12 13:25:28 +0200 |
|---|---|---|
| committer | Benjamin Berg <bberg@redhat.com> | 2018-04-12 13:50:12 +0200 |
| commit | b9ca35714ceb48652e8207c7b73b565ee7346219 (patch) | |
| tree | ef553cfc6fcd579705ba50aa73025b4589fc8c73 /tests | |
| parent | c343f5de1d53ce1c0e0634e73684939a1f2cc530 (diff) | |
| download | gnome-settings-daemon-b9ca35714ceb48652e8207c7b73b565ee7346219.tar.gz | |
tests: Support new SuspendAndHibernate method
This adds the required glue code to support it for old dbusmock versions
and allows SuspendAndHibernate to be picked by default.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gsdtestcase.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/gsdtestcase.py b/tests/gsdtestcase.py index 20bab9e0..ffb4a2b4 100644 --- a/tests/gsdtestcase.py +++ b/tests/gsdtestcase.py @@ -161,10 +161,17 @@ class GSDTestCase(X11SessionTestCase): def start_logind(self, parameters=None): '''start mock logind''' + if parameters is None: + parameters = {} self.logind, self.logind_obj = self.spawn_server_template('logind', - parameters or {}, + parameters, stdout=subprocess.PIPE) + # Monkey patch SuspendThenHibernate functions in for dbusmock <= 0.17.2 + # This should be removed once we can depend on dbusmock 0.17.3 + self.logind_obj.AddMethod('org.freedesktop.login1.Manager', 'SuspendThenHibernate', 'b', '', '') + self.logind_obj.AddMethod('org.freedesktop.login1.Manager', 'CanSuspendThenHibernate', '', 's', 'ret = "%s"' % parameters.get('CanSuspendThenHibernate', 'yes')) + # set log to nonblocking set_nonblock(self.logind.stdout) |