From 689dddee7f5f08039b69bc57801846a9c16b375c Mon Sep 17 00:00:00 2001
From: Andrew Bloomgarden <stalkingtiger@gmail.com>
Date: Sun, 12 Jan 2014 16:55:19 -0800
Subject: [PATCH] Actually wait for Selenium to start.

---
 test/run_tests.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/test/run_tests.sh b/test/run_tests.sh
index 5530b716fa..d024d35d71 100755
--- a/test/run_tests.sh
+++ b/test/run_tests.sh
@@ -16,5 +16,17 @@ NODE_DB_URI="$TEST_DB_URI" PORT=$TEST_SERVER_PORT node ./src/server.js > /dev/nu
 NODE_PID=$!
 trap "kill $NODE_PID && curl http://localhost:4444/selenium-server/driver/?cmd=shutDownSeleniumServer" EXIT
 
-sleep 3 # Wait for Selenium
+# Wait for selenium
+MAX_WAIT=30
+WAITED=0
+until nc -z localhost 4444; do
+  if [ $WAITED -ge $MAX_WAIT ]; then
+    echo "Waited $MAX_WAIT seconds, but Selenium never responded" >&2
+    kill $NODE_PID
+    exit 1
+  fi
+  sleep 1
+  let 'WAITED+=1'
+done
+
 mocha && grunt karma:continuous && ./node_modules/protractor/bin/protractor protractor.conf.js