add tests from origin/develop

tests/frontend/travis/runner.sh

@@ -1,18 +1,48 @@
-#!/bin/sh
+#!/bin/bash
+if [ -z "${SAUCE_USERNAME}" ]; then echo "SAUCE_USERNAME is unset - exiting"; exit 1; fi
+if [ -z "${SAUCE_ACCESS_KEY}" ]; then echo "SAUCE_ACCESS_KEY is unset - exiting"; exit 1; fi
 
-#Move to the base folder
-cd `dirname $0`
+# do not continue if there is an error
+set -eu
 
-#start Etherpad
-../../../bin/run.sh > /dev/null &
-sleep 10
+# source: https://stackoverflow.com/questions/59895/get-the-source-directory-of-a-bash-script-from-within-the-script-itself#246128
+MY_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
-#start remote runner
+# reliably move to the etherpad base folder before running it
+cd "${MY_DIR}/../../../"
+
+# start Etherpad, assuming all dependencies are already installed.
+#
+# This is possible because the "install" section of .travis.yml already contains
+# a call to bin/installDeps.sh
+echo "Running Etherpad directly, assuming bin/installDeps.sh has already been run"
+node node_modules/ep_etherpad-lite/node/server.js "${@}" &
+
+echo "Now I will try for 15 seconds to connect to Etherpad on http://localhost:9001"
+
+# wait for at most 15 seconds until Etherpad starts accepting connections
+#
+# modified from:
+# https://unix.stackexchange.com/questions/5277/how-do-i-tell-a-script-to-wait-for-a-process-to-start-accepting-requests-on-a-po#349138
+#
+(timeout 15 bash -c 'until echo > /dev/tcp/localhost/9001; do sleep 0.5; done') || \
+    (echo "Could not connect to Etherpad on http://localhost:9001" ; exit 1)
+
+echo "Successfully connected to Etherpad on http://localhost:9001"
+
+# On the Travis VM, remote_runner.js is found at
+# /home/travis/build/ether/[secure]/tests/frontend/travis/remote_runner.js
+# which is the same directory that contains this script.
+# Let's move back there.
+#
+# Probably remote_runner.js is injected by Saucelabs.
+cd "${MY_DIR}"
+
+# start the remote runner
+echo "Now starting the remote runner"
 node remote_runner.js
 exit_code=$?
 
-kill $!
 kill $(cat /tmp/sauce.pid)
-sleep 30
 
-exit $exit_code
+exit $exit_code