From 1b553ac046b57aefe44697ce42440e9702f45379 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 5 Mar 2018 14:47:25 +0100 Subject: power: Start mock upowerd earlier in the tests Otherwise gnome-session might try to use an unmocked upowerd on the system, causing crashes with our mock logind. --- plugins/power/test.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/plugins/power/test.py b/plugins/power/test.py index 0bb61c5f..c1f666a2 100755 --- a/plugins/power/test.py +++ b/plugins/power/test.py @@ -39,6 +39,17 @@ class PowerPluginTest(gsdtestcase.GSDTestCase): self.check_logind_gnome_session() self.start_logind() self.daemon_death_expected = False + + # start mock upowerd + (self.upowerd, self.obj_upower) = self.spawn_server_template( + 'upower', {'DaemonVersion': '0.99', 'OnBattery': True, 'LidIsClosed': False}, stdout=subprocess.PIPE) + gsdtestcase.set_nonblock(self.upowerd.stdout) + + # start mock gnome-shell screensaver + (self.screensaver, self.obj_screensaver) = self.spawn_server_template( + 'gnome_screensaver', stdout=subprocess.PIPE) + gsdtestcase.set_nonblock(self.screensaver.stdout) + self.session_log_write = open(os.path.join(self.workdir, 'gnome-session.log'), 'wb') self.session = subprocess.Popen(['gnome-session', '-f', '-a', os.path.join(self.workdir, 'autostart'), @@ -61,16 +72,6 @@ class PowerPluginTest(gsdtestcase.GSDTestCase): self.obj_session_mgr = self.session_bus_con.get_object( 'org.gnome.SessionManager', '/org/gnome/SessionManager') - # start mock upowerd - (self.upowerd, self.obj_upower) = self.spawn_server_template( - 'upower', {'DaemonVersion': '0.99', 'OnBattery': True, 'LidIsClosed': False}, stdout=subprocess.PIPE) - gsdtestcase.set_nonblock(self.upowerd.stdout) - - # start mock gnome-shell screensaver - (self.screensaver, self.obj_screensaver) = self.spawn_server_template( - 'gnome_screensaver', stdout=subprocess.PIPE) - gsdtestcase.set_nonblock(self.screensaver.stdout) - self.start_mutter() # Set up the gnome-session presence -- cgit v1.2.1