diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-04 16:32:10 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-04 16:32:10 +0100 |
commit | 7bc19340ee7ad7dfea8fc907f218d94024a94193 (patch) | |
tree | 6bfff1563fdd03c5ca6e7abdbb33e0fe400bf528 /tests | |
parent | 67e27b4f281e8b3a942fb9eaf354d70d2f7ee855 (diff) | |
parent | 79aba486ca998e16cc52975ef05692e4dccef766 (diff) | |
download | telepathy-salut-7bc19340ee7ad7dfea8fc907f218d94024a94193.tar.gz |
Merge branch 'telepathy-salut-0.8'
Diffstat (limited to 'tests')
-rw-r--r-- | tests/twisted/tools/with-session-bus.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/twisted/tools/with-session-bus.sh b/tests/twisted/tools/with-session-bus.sh index 1b8990e6..68aec5db 100644 --- a/tests/twisted/tools/with-session-bus.sh +++ b/tests/twisted/tools/with-session-bus.sh @@ -81,6 +81,12 @@ if [ -n "$CHECK_TWISTED_VERBOSE" ] || [ -n "$VERBOSE_TESTS" ]; then fi e=0 + +# These might be non-null when run from e.g. gnome-terminal 3.8, which uses +# an activatable service for its windows; we don't want to inherit them either +unset DBUS_STARTER_ADDRESS +unset DBUS_STARTER_BUS_TYPE + DBUS_SESSION_BUS_ADDRESS="`cat $me-$$.address`" export DBUS_SESSION_BUS_ADDRESS |