remove docker from tests

Signed-off-by: MohammadReza vahedi <[email protected]>
pdsinterop · Sep 2, 2023 · c8c1f47 · c8c1f47
1 parent e4644f7
commit c8c1f47
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 156 deletions.
diff --git a/test/surface/docker/cookie/.dockerignore b/test/surface/docker/cookie/.dockerignore
diff --git a/test/surface/docker/cookie/Dockerfile b/test/surface/docker/cookie/Dockerfile
diff --git a/test/surface/docker/cookie/app/index.js b/test/surface/docker/cookie/app/index.js
diff --git a/test/surface/docker/cookie/app/package-lock.json b/test/surface/docker/cookie/app/package-lock.json
diff --git a/test/surface/docker/cookie/app/package.json b/test/surface/docker/cookie/app/package.json
diff --git a/test/surface/docker/solid-crud/Dockerfile b/test/surface/docker/solid-crud/Dockerfile
diff --git a/test/surface/docker/web-access-control/Dockerfile b/test/surface/docker/web-access-control/Dockerfile
diff --git a/test/surface/docker/webid-provider/Dockerfile b/test/surface/docker/webid-provider/Dockerfile
diff --git a/test/surface/run-solid-test-suite.sh b/test/surface/run-solid-test-suite.sh
@@ -2,62 +2,48 @@
 set -e
 
 function setup {
-  echo Branch name: $1
-  docker network create testnet
-  docker build -t server .
-  docker build -t cookie test/surface/docker/cookie
-  docker run -d --env-file test/surface/server-env.list --name server --network=testnet server
-  docker run -d --env-file test/surface/thirdparty-env.list --name thirdparty --network=testnet server
-}
-function teardown {
-  docker stop `docker ps --filter network=testnet -q`
-  docker rm `docker ps --filter network=testnet -qa`
-  docker network remove testnet
+  npm ci
+  npm start &> '/dev/null' &
+  git clone https://github.com/solid-contrib/solid-crud-tests.git
+  cd solid-crud-tests
+  git fetch origin
+  git checkout nss-skips
+  git pull
+  npm ci
+  cd ..
+  git clone https://github.com/solid-contrib/web-access-control-tests.git
+  cd  web-access-control-tests
+  #git fetch origin
+  #git checkout run-against-css
+  git pull
+  npm ci
+  cd ..
 }
 
-function waitForNss {
-  docker pull solidtestsuite/webid-provider-tests
-  until docker run --rm --network=testnet solidtestsuite/webid-provider-tests curl -kI http://$1:3000 2> /dev/null > /dev/null
+function waitForCss {
+  until curl -kI http://localhost:3000 2> /dev/null
   do
-    echo Waiting for $1 to start, this can take up to a minute ...
-    docker ps -a
-    docker logs $1
+    echo Waiting for CSS to start, this can take up to a minute ...
     sleep 1
   done
+}
 
-  docker logs $1
-  echo Getting cookie for $1...
-  export COOKIE_$1="`docker run --cap-add=SYS_ADMIN --network=testnet --env-file test/surface/$1-env.list cookie`"
+function teardown {
+  kill $(lsof -t -i :3000)
+  rm -rf solid-crud-tests web-access-control-tests
 }
 
 function runTests {
-  docker pull solidtestsuite/$1:$2
-
-  echo "Running $1 against server with cookie $COOKIE_server"
-  docker run --rm --network=testnet \
-    --env COOKIE="$COOKIE_server" \
-    --env COOKIE_ALICE="$COOKIE_server" \
-    --env COOKIE_BOB="$COOKIE_thirdparty" \
-    --env-file test/surface/$1-env.list solidtestsuite/$1:$2
+  cd $1
+  ./run-against-css.sh
+  cd ..
 }
 
 # ...
 teardown || true
-setup $1
-waitForNss server
-#runTests webid-provider-tests v2.0.3
-runTests solid-crud-tests v6.0.0
-#waitForNss thirdparty
-#runTests web-access-control-tests v7.1.0
+setup
+waitForCss
+runTests solid-crud-tests
+runTests web-access-control-tests
 teardown
 
-# To debug, e.g. running web-access-control-tests jest interactively,
-# comment out `teardown` and uncomment this instead:
-# env
-# docker run -it --network=testnet \
-#     --env COOKIE="$COOKIE_server" \
-#     --env COOKIE_ALICE="$COOKIE_server" \
-#     --env COOKIE_BOB="$COOKIE_thirdparty" \
-#     --env-file test/surface/web-access-control-tests-env.list \
-#   solidtestsuite/web-access-control-tests:latest /bin/bash
-
diff --git a/test/surface/server-env.list b/test/surface/server-env.list
diff --git a/test/surface/solid-crud-tests-env.list b/test/surface/solid-crud-tests-env.list
diff --git a/test/surface/thirdparty-config.json b/test/surface/thirdparty-config.json
diff --git a/test/surface/thirdparty-env.list b/test/surface/thirdparty-env.list
diff --git a/test/surface/webid-provider-tests-env.list b/test/surface/webid-provider-tests-env.list