Commit 0bc5b695 authored by Holger Levsen's avatar Holger Levsen
Browse files

torbrowser tests: give dbus more time to start

parent 54713ba2
...@@ -196,12 +196,12 @@ download_and_launch() { ...@@ -196,12 +196,12 @@ download_and_launch() {
echo "$(date -u ) - starting dbus service." echo "$(date -u ) - starting dbus service."
# yes, torbrowser needs dbus # yes, torbrowser needs dbus
schroot --run-session -c $SESSION --directory /tmp -u root -- service dbus start schroot --run-session -c $SESSION --directory /tmp -u root -- service dbus start
sleep 3 sleep 5
echo "$(date -u) - starting Xvfb on :$SCREEN.0 now." echo "$(date -u) - starting Xvfb on :$SCREEN.0 now."
# start X on virtual framebuffer device # start X on virtual framebuffer device
Xvfb -ac -br -screen 0 ${SIZE}x24 :$SCREEN & Xvfb -ac -br -screen 0 ${SIZE}x24 :$SCREEN &
XPID=$! XPID=$!
sleep 2 sleep 3
# configure environment # configure environment
export DISPLAY=":$SCREEN.0" export DISPLAY=":$SCREEN.0"
echo export DISPLAY=":$SCREEN.0" echo export DISPLAY=":$SCREEN.0"
...@@ -212,7 +212,7 @@ download_and_launch() { ...@@ -212,7 +212,7 @@ download_and_launch() {
#export LC_ALL="de_DE.UTF-8" #export LC_ALL="de_DE.UTF-8"
echo "$(date -u) - starting awesome." echo "$(date -u) - starting awesome."
timeout -k 30m 29m schroot --run-session -c $SESSION --preserve-environment -- awesome & timeout -k 30m 29m schroot --run-session -c $SESSION --preserve-environment -- awesome &
sleep 3 sleep 5
# configure dbus session for this user's session # configure dbus session for this user's session
DBUS_SESSION_FILE=$(mktemp -t torbrowser-launcher-XXXXXX) DBUS_SESSION_FILE=$(mktemp -t torbrowser-launcher-XXXXXX)
DBUS_SESSION_POINTER=$(schroot --run-session -c $SESSION --preserve-environment -- ls $HOME/.dbus/session-bus/ -t1 | head -1) DBUS_SESSION_POINTER=$(schroot --run-session -c $SESSION --preserve-environment -- ls $HOME/.dbus/session-bus/ -t1 | head -1)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment