Commit bc66cf7a authored by Sam Thursfield's avatar Sam Thursfield

functional-tests: Fix hang in Helper.stop()

If the process had already stopped, we would run the mainloop anyway
and hang forever.
parent 0a39a3b1
Pipeline #20507 passed with stage
in 4 minutes and 16 seconds
......@@ -189,11 +189,11 @@ class Helper:
self.process.kill()
self.process.wait()
log ("[%s] stopped." % self.PROCESS_NAME)
log ("[%s] stopped." % self.PROCESS_NAME)
# Run the loop until the bus name appears, or the process dies.
self.loop.run_checked ()
Gio.bus_unwatch_name(self._bus_name_watch_id)
# Run the loop until the bus name disappears, or the process dies.
self.loop.run_checked ()
Gio.bus_unwatch_name(self._bus_name_watch_id)
self.process = None
_process_list.remove(self)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment