From d458305f93d09bd0156ab2a508cf19239d851323 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 29 Jul 2019 08:23:27 +1000 Subject: [PATCH] tools: ratbagdctl.test: if an exception occurs during startup, terminate Don't leave a ratbagd.devel process hanging if something goes wrong. Signed-off-by: Peter Hutterer --- tools/ratbagctl.test.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/ratbagctl.test.in b/tools/ratbagctl.test.in index fc04ec67..e06e5461 100755 --- a/tools/ratbagctl.test.in +++ b/tools/ratbagctl.test.in @@ -800,8 +800,13 @@ def setUpModule(): ratbagd_process = toolbox.start_ratbagd() assert ratbagd_process is not None - ratbagd = toolbox.open_ratbagd(ratbagd_process) - assert ratbagd is not None + try: + ratbagd = toolbox.open_ratbagd(ratbagd_process) + assert ratbagd is not None + except Exception as e: + if ratbagd_process is not None: + toolbox.terminate_ratbagd(ratbagd_process) + raise e parser = toolbox.get_parser()