Merge pull request #200 from snapview/use-autobahn-in-docker

Use Autobahn Suite from Docker, symmetrical to snapview/tokio-tungstenite#165

.travis.yml

@@ -2,9 +2,8 @@ language: rust
 rust:
   - stable
 
-install:
+services:
-  - sudo apt-get install python-unittest2
+  - docker
-  - sudo pip install ghp-import urllib3[secure] autobahntestsuite
 
 before_script:
   - export PATH="$PATH:$HOME/.cargo/bin"

scripts/autobahn-client.sh

@@ -6,27 +6,31 @@ SOURCE_DIR=$(readlink -f "${BASH_SOURCE[0]}")
 SOURCE_DIR=$(dirname "$SOURCE_DIR")
 cd "${SOURCE_DIR}/.."
 
+CONTAINER_NAME=fuzzingserver
 function cleanup() {
-    kill -9 ${FUZZINGSERVER_PID}
+    docker container stop "${CONTAINER_NAME}"
 }
 trap cleanup TERM EXIT
 
 function test_diff() {
     if ! diff -q \
-        <(jq -S 'del(."Tungstenite" | .. | .duration?)' 'autobahn/client-results.json') \
+        <(jq -S 'del(."Tungstenite" | .. | .duration?)' 'autobahn/expected-results.json') \
         <(jq -S 'del(."Tungstenite" | .. | .duration?)' 'autobahn/client/index.json')
     then
         echo 'Difference in results, either this is a regression or' \
-             'one should update autobahn/client-results.json with the new results.' \
+             'one should update autobahn/expected-results.json with the new results.' \
-             'The results are:'
         exit 64
     fi
 }
 
-cargo build --release --example autobahn-client
+docker run -d --rm \
+    -v "${PWD}/autobahn:/autobahn" \
+    -p 9001:9001 \
+    --init \
+    --name "${CONTAINER_NAME}" \
+    crossbario/autobahn-testsuite \
+    wstest -m fuzzingserver -s 'autobahn/fuzzingserver.json'
 
-wstest -m fuzzingserver -s 'autobahn/fuzzingserver.json' & FUZZINGSERVER_PID=$!
 sleep 3
-echo "Server PID: ${FUZZINGSERVER_PID}"
 cargo run --release --example autobahn-client
 test_diff

scripts/autobahn-server.sh

@@ -5,7 +5,6 @@ set -x
 SOURCE_DIR=$(readlink -f "${BASH_SOURCE[0]}")
 SOURCE_DIR=$(dirname "$SOURCE_DIR")
 cd "${SOURCE_DIR}/.."
-WSSERVER_PID=
 
 function cleanup() {
     kill -9 ${WSSERVER_PID}
@@ -14,18 +13,22 @@ trap cleanup TERM EXIT
 
 function test_diff() {
     if ! diff -q \
-        <(jq -S 'del(."Tungstenite" | .. | .duration?)' 'autobahn/client-results.json') \
+        <(jq -S 'del(."Tungstenite" | .. | .duration?)' 'autobahn/expected-results.json') \
         <(jq -S 'del(."Tungstenite" | .. | .duration?)' 'autobahn/server/index.json')
     then
-        echo Difference in results, either this is a regression or \
+        echo 'Difference in results, either this is a regression or' \
-             one should update autobahn/server-results.json with the new results.
+             'one should update autobahn/expected-results.json with the new results.' \
         exit 64
     fi
 }
 
-cargo build --release --example autobahn-server
 cargo run --release --example autobahn-server & WSSERVER_PID=$!
-echo "Server PID: ${WSSERVER_PID}"
 sleep 3
-wstest -m fuzzingclient -s 'autobahn/fuzzingclient.json'
+
+docker run --rm \
+    -v "${PWD}/autobahn:/autobahn" \
+    --network host \
+    crossbario/autobahn-testsuite \
+    wstest -m fuzzingclient -s 'autobahn/fuzzingclient.json'
+
 test_diff