From 0e26b6e2be5b4cdad6b9b01007f3a3af26673af8 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 24 Jul 2017 11:14:28 +1000 Subject: [PATCH] tools: ratbagctl: check ratbagd for immediate exit before continuing Signed-off-by: Peter Hutterer --- ratbagd/ratbagd.c | 2 +- tools/ratbagctl.test.in | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ratbagd/ratbagd.c b/ratbagd/ratbagd.c index bca3580f..29ddd5bb 100644 --- a/ratbagd/ratbagd.c +++ b/ratbagd/ratbagd.c @@ -688,7 +688,7 @@ exit: if (r < 0) { errno = -r; - log_error("Failed: %m\n"); + log_error("Failed to start ratbagd: %m\n"); return EXIT_FAILURE; } diff --git a/tools/ratbagctl.test.in b/tools/ratbagctl.test.in index ce6bb521..c396604d 100755 --- a/tools/ratbagctl.test.in +++ b/tools/ratbagctl.test.in @@ -503,6 +503,13 @@ def setUpModule(): ratbagd = ratbagctl.open_ratbagd() assert ratbagd is not None + # if some old version of ratbagd is still running, ratbagd_process may + # have never started but our DBus bindings may succeed. Check for the + # return code here, this also gives ratbagd enough time to start and + # die. If we check immediately we may not have terminated yet. + ratbagd_process.poll() + assert ratbagd_process.returncode is None + parser = ratbagctl.get_parser()