Wait for Xvfb to start in run-test

freedomofpress · Apr 3, 2019 · fb014bd · fb014bd
1 parent 7960dbc
commit fb014bd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/securedrop/bin/dev-deps b/securedrop/bin/dev-deps
@@ -3,7 +3,15 @@
 export DISPLAY=:1
 
 function run_xvfb() {
-    setsid Xvfb :1 -screen 0 1024x768x24 -ac +extension GLX +render -noreset >& /tmp/xvfb.out || cat /tmp/xvfb.out
+    (setsid Xvfb :1 -screen 0 1024x768x24 -ac +extension GLX +render -noreset >& /tmp/xvfb.out || cat /tmp/xvfb.out) &
+
+    # give it time to start
+    for i in {1..10}
+    do
+        xdpyinfo -display :1 >/dev/null 2>&1 && return 0
+        sleep 1
+    done
+    xdpyinfo -display :1 >/dev/null 2>&1 || (echo "Xvfb is not available"; exit 1)
 }
 
 function run_redis() {

diff --git a/securedrop/bin/run-test b/securedrop/bin/run-test
@@ -5,9 +5,9 @@ set -euo pipefail
 
 source "${BASH_SOURCE%/*}/dev-deps"
 
-setup_vncauth
+run_xvfb
 run_redis &
-run_xvfb &
+setup_vncauth
 run_x11vnc &
 urandom
 run_sass --force --update