From: Simon McVittie <smcv@collabora.com>
Date: Wed, 5 Jul 2017 14:30:05 +0000 (+0100)
Subject: test/dbus-daemon: Unset DBUS_SESSION_BUS_ADDRESS
X-Git-Tag: dbus-1.10.22~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e48532d242c8f7529960b2bbee85e11179cfb56;p=thirdparty%2Fdbus.git

test/dbus-daemon: Unset DBUS_SESSION_BUS_ADDRESS

When we intend to exercise the default behaviour in the absence of
DBUS_SESSION_BUS_ADDRESS (but with an XDG_RUNTIME_DIR present), it would
help if we unset DBUS_SESSION_BUS_ADDRESS. Otherwise we'll just connect
to the real session bus, if there is one.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101698
---

diff --git a/test/dbus-daemon.c b/test/dbus-daemon.c
index 99d2bc632..d940f4313 100644
--- a/test/dbus-daemon.c
+++ b/test/dbus-daemon.c
@@ -147,6 +147,7 @@ setup (Fixture *f,
       /* we're relying on being single-threaded for this to be safe */
       f->saved_runtime_dir = g_strdup (g_getenv ("XDG_RUNTIME_DIR"));
       g_setenv ("XDG_RUNTIME_DIR", f->tmp_runtime_dir, TRUE);
+      g_unsetenv ("DBUS_SESSION_BUS_ADDRESS");
     }
 
   address = test_get_dbus_daemon (config ? config->config_file : NULL,