diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-04 16:22:08 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-04 16:22:08 +0100 |
| commit | 7d81f2e320573647b2049c02a31db0aa3d554e77 (patch) | |
| tree | 3a35d65cfb03779582906f6d0ebc61f550a3a4d7 | |
| parent | ac6b926a59d30888a5a62779da16d45f99eeb292 (diff) | |
| parent | f53ea2d64807cf625ca49f6163b77a36a8282f0d (diff) | |
Merge branch 'telepathy-gabble-0.16'
| -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 1b8990e61..68aec5db4 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 |