non working experimental status

test/makefile.am

@@ -8,8 +8,8 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
-
-
-TESTS =
+dist_check_DATA = settings.wt testcase.wt
+dist_check_SCRIPTS = runtests.sh
+TESTS = $(dist_check_SCRIPTS)
 
 MAINTAINERCLEANFILES = makefile.in

test/runtests.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash
 
 #check for a text in a docker volume log
 function check() {
@@ -41,17 +41,24 @@ fi
 
 # option checks
 NEED_XVFB=0
-NEED_DOCKER=0
+NEED_DOCKER=1
 NEED_WEBTESTER=0
+PORT=
 while test $# -gt 0; do
     case "$1" in
         (--help|-h)
-            echo "$0 [OPTIONS] [PORTS <port>]"
+            echo "$0 [OPTIONS]"
             echo
             echo "OPTIONS:"
             echo
+            echo " -p <PORT>  don't run, just prepare test on port <PORT>"
+            echo
             exit 0
             ;;
+        (-p|--port)
+            shift
+            PORT=$1
+            ;;
         (*) echo "**** ERROR: unknown option '$1', try --help"; exit 1;;
     esac
     if test $# -eq 0; then
@@ -120,6 +127,18 @@ set -x
 # Add tests here
 MYSQL=$(docker run -d -e MYSQL_ROOT_PASSWORD=TopSecretLOL mysql)
 PHP=$(docker run -d --volume $(pwd)/../html:/usr/share/nginx/html:ro --link ${MYSQL}:mysql mwaeckerlin/php-fpm)
-NGINX=$(docker run -d --volumes-from ${PHP} --link ${PHP}:php -p 8080:80 mwaeckerlin/nginx)
-trap "docker rm -f ${NGINX} ${PHP} ${MYSQL}" INT TERM EXIT
-sleep 60
+if test -z "${PORT}"; then
+    NGINX=$(docker run -d --volumes-from ${PHP} --link ${PHP}:php mwaeckerlin/nginx)
+    trap "docker rm -f ${NGINX} ${PHP} ${MYSQL}" INT TERM EXIT
+    docker pull mwaeckerlin/webtester
+    set -e
+    countdown 10 20 wait_for_mysql ${MYSQL}
+    docker run --rm --link ${NGINX}:safechat -u $(id -u) -v $(pwd):/tests -e WEBRUNNER_SCRIPTS="settings.wt testcase.wt" mwaeckerlin/webtester
+else
+    NGINX=$(docker run -d -p ${PORT}:80 --volumes-from ${PHP} --link ${PHP}:php mwaeckerlin/nginx)
+    trap "docker rm -f ${NGINX} ${PHP} ${MYSQL}" INT TERM EXIT
+    set +x
+    echo "Ready to test; press enter to end"
+    read
+    set -x
+fi

test/settings.wt

@@ -1 +1,3 @@
-set SAFECHAT-URL=http://localhost:8080
+set SAFECHAT-URL=http://safechat
+set SAFECHAT-URL=http://localhost:8888
+offline-storage-path /tmp/safechat-test