tests: use dbus-run-session instead of dbus-launch

The dbus-run-session utility was designed to run a process within a
D-Bus session, specifically for running regressions tests and is much
better suited then dbus-launch. As an additional benefit, this avoids
any X dependencies.

https://mail.gnome.org/archives/networkmanager-list/2016-January/msg00023.html

diff --git a/libnm-glib/tests/libnm-glib-test-launch.sh b/libnm-glib/tests/libnm-glib-test-launch.sh
index 980f834..1064e41 100755 (executable)
--- a/libnm-glib/tests/libnm-glib-test-launch.sh
+++ b/libnm-glib/tests/libnm-glib-test-launch.sh
@@ -1,7 +1,3 @@
 #!/bin/sh
 
-# Spawn DBus
-eval `dbus-launch --sh-syntax`
-trap "kill $DBUS_SESSION_BUS_PID" EXIT
-
-"$@"
+dbus-run-session -- "$@"

diff --git a/libnm/tests/libnm-test-launch.sh b/libnm/tests/libnm-test-launch.sh
index 980f834..1064e41 100755 (executable)
--- a/libnm/tests/libnm-test-launch.sh
+++ b/libnm/tests/libnm-test-launch.sh
@@ -1,7 +1,3 @@
 #!/bin/sh
 
-# Spawn DBus
-eval `dbus-launch --sh-syntax`
-trap "kill $DBUS_SESSION_BUS_PID" EXIT
-
-"$@"
+dbus-run-session -- "$@"