[Pkg-privacy-commits] [onioncircuits] 01/01: do not use dbus-launch in autopkgtest

[Sascha Steinbiss]

This is an automated email from the git hooks/post-receive script.

satta pushed a commit to branch master
in repository onioncircuits.

commit 62738e10c3c1880d864e0f27115ef9a9f5f24123
Author: Sascha Steinbiss <satta at debian.org>
Date:   Wed Aug 31 19:37:04 2016 +0000

    do not use dbus-launch in autopkgtest
---
 debian/changelog          | 7 +++++++
 debian/tests/control      | 4 ++--
 debian/tests/gui-test     | 2 +-
 debian/tests/gui-tor-test | 8 +++++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a85c70d..8148367 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+onioncircuits (0.4-3) unstable; urgency=medium
+
+  * Do not use dbus-launch to set up dbus environment.
+    Closes: #836121
+
+ -- Sascha Steinbiss <satta at debian.org>  Wed, 31 Aug 2016 18:47:22 +0000
+
 onioncircuits (0.4-2) unstable; urgency=medium
 
   * use https for d/copyright's Format entry
diff --git a/debian/tests/control b/debian/tests/control
index f76cf5e..01d7172 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: gui-test
-Depends: @, psmisc, xvfb, dbus-x11, gir1.2-wnck-3.0, libglib2.0-bin, python-dogtail, tor, python-stem
-Restrictions: needs-root, isolation-container, allow-stderr, needs-recommends
\ No newline at end of file
+Depends: @, psmisc, xvfb, dbus (>= 1.8), gir1.2-wnck-3.0, libglib2.0-bin, python-dogtail, tor, python-stem
+Restrictions: needs-root, isolation-container, allow-stderr, needs-recommends
diff --git a/debian/tests/gui-test b/debian/tests/gui-test
index 6441f01..ce3c4d5 100755
--- a/debian/tests/gui-test
+++ b/debian/tests/gui-test
@@ -4,4 +4,4 @@
 set -e
 
 useradd -g users -G debian-tor -m testuser
-su testuser -c debian/tests/gui-tor-test
\ No newline at end of file
+su testuser -c debian/tests/gui-tor-test
diff --git a/debian/tests/gui-tor-test b/debian/tests/gui-tor-test
index bf89567..a354c78 100755
--- a/debian/tests/gui-tor-test
+++ b/debian/tests/gui-tor-test
@@ -30,8 +30,10 @@ export DISPLAY=:5
 export XAUTHORITY=/dev/null
 
 # start local D-Bus session
-eval `dbus-launch`
-export DBUS_SESSION_BUS_ADDRESS
+dbus-daemon --fork --session --print-address=3 --print-pid=4 \
+    3> /tmp/dbus-session-bus-address 4> /tmp/dbus-session-bus-pid
+export DBUS_SESSION_BUS_ADDRESS="$(cat /tmp/dbus-session-bus-address)"
+DBUS_SESSION_BUS_PID="$(cat /tmp/dbus-session-bus-pid)"
 
 # register clean up handler
 trap "rm -rf $WORKDIR && kill $DBUS_SESSION_BUS_PID $XVFB_PID" 0 INT QUIT ABRT PIPE TERM
@@ -43,4 +45,4 @@ gsettings set org.gnome.desktop.interface toolkit-accessibility true
 killall -q onioncircuits || true
 
 # run test
-debian/tests/check-circuits
\ No newline at end of file
+debian/tests/check-circuits

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncircuits.git