From c099e9d43b2d59af27b68b3a3fb7e5aa078e2244 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 26 May 2015 13:25:23 +0200 Subject: [PATCH] tests: don't try to connect to the private socket Even if we're running the tests as root we still want to use the mock service instead of whatever version of daemon runs on the test host. (cherry picked from commit 02e3d6c2866402549c6976f564eb663ff12d3ebd) --- libnm/nm-dbus-helpers.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libnm/nm-dbus-helpers.c b/libnm/nm-dbus-helpers.c index 6bfd4bbd83..a9fc58edf3 100644 --- a/libnm/nm-dbus-helpers.c +++ b/libnm/nm-dbus-helpers.c @@ -93,7 +93,8 @@ _nm_dbus_new_connection (GCancellable *cancellable, GError **error) GDBusConnection *connection = NULL; /* If running as root try the private bus first */ - if (0 == geteuid ()) { + if (0 == geteuid () && !g_test_initialized ()) { + GError *local = NULL; GDBusConnection *p; @@ -203,7 +204,7 @@ _nm_dbus_new_connection_async (GCancellable *cancellable, simple = g_simple_async_result_new (NULL, callback, user_data, _nm_dbus_new_connection_async); /* If running as root try the private bus first */ - if (0 == geteuid ()) { + if (0 == geteuid () && !g_test_initialized ()) { GDBusConnection *p; if (cancellable) {