aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2018-07-08 13:02:19 +0200
committerMichael Albinus2018-07-08 13:02:19 +0200
commite02d8e29c6009dbaf04d3e1668f476ba000c7f02 (patch)
tree61ffd7ae3eeb5410fe69b21cb22272a6c5a14b0e
parentda5d6dbe3974a8012d4fb6a0281d583965742aaa (diff)
downloademacs-e02d8e29c6009dbaf04d3e1668f476ba000c7f02.tar.gz
emacs-e02d8e29c6009dbaf04d3e1668f476ba000c7f02.zip
Fix Bug#32084
* test/lisp/net/dbus-tests.el (dbus-test02-register-service-own-bus): Unset $DISPLAY when calling dbus-launch, in order to avoid possible X11 authentication errors. (Bug#32084)
-rw-r--r--test/lisp/net/dbus-tests.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el
index 624d15ef5f1..8fcb8a564bb 100644
--- a/test/lisp/net/dbus-tests.el
+++ b/test/lisp/net/dbus-tests.el
@@ -133,7 +133,8 @@ This includes initialization and closing the bus."
133 ;; Start bus. 133 ;; Start bus.
134 (let ((output 134 (let ((output
135 (ignore-errors 135 (ignore-errors
136 (shell-command-to-string "dbus-launch --sh-syntax"))) 136 (shell-command-to-string
137 "env DISPLAY= dbus-launch --sh-syntax --close-stderr")))
137 bus pid) 138 bus pid)
138 (skip-unless (stringp output)) 139 (skip-unless (stringp output))
139 (when (string-match "DBUS_SESSION_BUS_ADDRESS='\\(.+\\)';" output) 140 (when (string-match "DBUS_SESSION_BUS_ADDRESS='\\(.+\\)';" output)