From 504bae20d2f1673e7e4cc04aadd3575d37bfed53 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Mon, 3 Aug 2020 18:55:32 +0100 Subject: [PATCH] tests/launcher: Test new Terminate() method Signed-off-by: Simon McVittie <smcv@collabora.com> --- tests/launcher.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tests/launcher.py b/tests/launcher.py index d9d50da73..c7bf88818 100755 --- a/tests/launcher.py +++ b/tests/launcher.py @@ -202,6 +202,7 @@ class TestLauncher(BaseTest): def test_socket(self) -> None: with tempfile.TemporaryDirectory(prefix='test-') as temp: + need_terminate = True proc = subprocess.Popen( self.launcher + [ '--socket', os.path.join(temp, 'socket'), @@ -365,8 +366,23 @@ class TestLauncher(BaseTest): 'Process %d did not exit' % pid ) + conn.call_sync( + None, + LAUNCHER_PATH, + LAUNCHER_IFACE, + 'Terminate', + GLib.Variant('()', ()), + GLib.VariantType('()'), + Gio.DBusCallFlags.NONE, + -1, + None, + ) + need_terminate = False + finally: - proc.terminate() + if need_terminate: + proc.terminate() + proc.wait() self.assertEqual(proc.returncode, 0) -- GitLab