dbus-dos-reply-time: kill any stray dbus-test-tool processes first

Otherwise, leftover dbus-test-tool processes from some other test
could be still on the bus, causing misleading results.

Differential Revision: https://phabricator.apertis.org/D365
Reviewed-by: pwith

dbus/dos-reply-time/run-test.sh

@@ -53,6 +53,9 @@ check_time() {
 test_basic() {
     set -e
 
+    pkill dbus-test-tool || true
+    sleep 1
+
     dbus-test-tool echo --name=test.basic &
     PID=$!
     sleep 0.5
@@ -73,6 +76,9 @@ test_basic() {
 test_some_load() {
     set -e
 
+    pkill dbus-test-tool || true
+    sleep 1
+
     dbus-test-tool echo --name=test.some.load.service &
     SERVICE_PID=$!
     dbus-test-tool echo --name=test.some.load.spam.service &
@@ -102,6 +108,9 @@ test_some_load() {
 test_heavy_load() {
     set -e
 
+    pkill dbus-test-tool || true
+    sleep 1
+
     dbus-test-tool echo --name=test.heavy.load.service &
     SERVICE_PID=$!
     dbus-test-tool echo --name=test.heavy.load.spam.service &
@@ -134,6 +143,9 @@ test_heavy_load() {
 test_match_rules() {
     set -e
 
+    pkill dbus-test-tool || true
+    sleep 1
+
     BUS=session
 
     MONITOR_PIDS=

debian/changelog

@@ -22,6 +22,7 @@ apertis-tests (1:0.20150814.2) UNRELEASED; urgency=medium
     by default on their own session buses.
   * dbus-dos-reply-time: use --messages-per-conn=1 instead of --new-conn.
     This syntax change was made when dbus-test-tool was merged upstream.
+  * dbus-dos-reply-time: kill any stray dbus-test-tool processes first
 
  -- Simon McVittie <simon.mcvittie@collabora.co.uk>  Tue, 25 Aug 2015 11:35:18 +0100