colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: don't try to connect to the private socket

Browse Source 
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.
This commit is contained in:
Lubomir Rintel
2015-05-26 13:25:23 +02:00
parent dd959087a2
commit 02e3d6c286
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libnm/nm-dbus-helpers.c
View File

@@ -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) {