From 4cf0008fe1cbe7112c915c14c9787ccf88674152 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 24 Nov 2021 13:00:40 +0000 Subject: [PATCH 1/5] Run latest versions of test suites --- run-solid-test-suite.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/run-solid-test-suite.sh b/run-solid-test-suite.sh index db75949..d90a510 100755 --- a/run-solid-test-suite.sh +++ b/run-solid-test-suite.sh @@ -13,10 +13,10 @@ function setup { docker pull solidtestsuite/webid-provider-tests:v2.0.3 docker tag solidtestsuite/webid-provider-tests:v2.0.3 webid-provider-tests - docker pull solidtestsuite/solid-crud-tests:pss-skips - docker tag solidtestsuite/solid-crud-tests:pss-skips solid-crud-tests - docker pull solidtestsuite/web-access-control-tests:v5.1.0 - docker tag solidtestsuite/web-access-control-tests:v5.1.0 web-access-control-tests + docker pull solidtestsuite/solid-crud-tests:v5.1.0 + docker tag solidtestsuite/solid-crud-tests:v5.1.0 solid-crud-tests + docker pull solidtestsuite/web-access-control-tests:v6.0.0 + docker tag solidtestsuite/web-access-control-tests:v6.0.0 web-access-control-tests } function runPss { From 4ad3b31e6e5b3c2ad0a7f240c70c093036d88108 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 24 Nov 2021 13:15:06 +0000 Subject: [PATCH 2/5] Stop if can't get cookie --- run-solid-test-suite.sh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/run-solid-test-suite.sh b/run-solid-test-suite.sh index d90a510..a50172a 100755 --- a/run-solid-test-suite.sh +++ b/run-solid-test-suite.sh @@ -36,10 +36,26 @@ function runPss { docker logs server echo Confirmed that https://server is started now, assuming that https://thirdparty will also come online soon - echo Getting cookie... + echo Getting cookie for Alice... export COOKIE="`docker run --rm --cap-add=SYS_ADMIN --network=testnet -e SERVER_TYPE=php-solid-server --env-file ./env-vars-for-test-image.list cookie`" + if [[ $COOKIE == PHPSESSID* ]] + then + echo Successfully obtained cookie for Alice: $COOKIE + else + echo Error obtaining cookie for Alice, stopping. + exit 1 + fi + + echo Getting cookie for Bob... export COOKIE_BOB="`docker run --rm --cap-add=SYS_ADMIN --network=testnet -e SERVER_TYPE=php-solid-server --env-file ./env-vars-for-third-party.list cookie`" -} + if [[ $COOKIE_BOB == PHPSESSID* ]] + then + echo Successfully obtained cookie for Bob: $COOKIE_BOB + else + echo Error obtaining cookie for Bob, stopping. + exit 1 + fi + } function runTests { echo "Running webid-provider tests with cookie $COOKIE" From 3c012beff5ab1d4703c434d2800d50de850b8e83 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 24 Nov 2021 13:26:31 +0000 Subject: [PATCH 3/5] Check if thirdparty also comes online --- run-solid-test-suite.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/run-solid-test-suite.sh b/run-solid-test-suite.sh index a50172a..317c3ff 100755 --- a/run-solid-test-suite.sh +++ b/run-solid-test-suite.sh @@ -34,7 +34,7 @@ function runPss { done docker ps -a docker logs server - echo Confirmed that https://server is started now, assuming that https://thirdparty will also come online soon + echo Confirmed that https://server is started now echo Getting cookie for Alice... export COOKIE="`docker run --rm --cap-add=SYS_ADMIN --network=testnet -e SERVER_TYPE=php-solid-server --env-file ./env-vars-for-test-image.list cookie`" @@ -46,6 +46,17 @@ function runPss { exit 1 fi + until docker run --rm --network=testnet webid-provider-tests curl -kI https://thirdparty 2> /dev/null > /dev/null + do + echo Waiting for thirdparty to start, this can take up to a minute ... + docker ps -a + docker logs thirdparty + sleep 1 + done + docker ps -a + docker logs thirdparty + echo Confirmed that https://thirdparty is started now + echo Getting cookie for Bob... export COOKIE_BOB="`docker run --rm --cap-add=SYS_ADMIN --network=testnet -e SERVER_TYPE=php-solid-server --env-file ./env-vars-for-third-party.list cookie`" if [[ $COOKIE_BOB == PHPSESSID* ]] From 31e13e1dca517a1955953c4ec4ebcde19c27fe9e Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 24 Nov 2021 13:27:14 +0000 Subject: [PATCH 4/5] SKIP_CONC=1 --- env-vars-for-test-image.list | 1 + 1 file changed, 1 insertion(+) diff --git a/env-vars-for-test-image.list b/env-vars-for-test-image.list index d051a55..f17940e 100644 --- a/env-vars-for-test-image.list +++ b/env-vars-for-test-image.list @@ -11,3 +11,4 @@ STORAGE_ROOT_BOB=https://thirdparty/storage USERNAME=alice PASSWORD=alice123 PUBSUB_URL=http://pubsub:8080 +SKIP_CONC=1 From 497de718b452e2ff52e24e7ded3d42cf2aa56419 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 24 Nov 2021 13:27:41 +0000 Subject: [PATCH 5/5] Use solid-crud-tests v5.2.0 --- run-solid-test-suite.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run-solid-test-suite.sh b/run-solid-test-suite.sh index 317c3ff..ac1e5cf 100755 --- a/run-solid-test-suite.sh +++ b/run-solid-test-suite.sh @@ -13,8 +13,8 @@ function setup { docker pull solidtestsuite/webid-provider-tests:v2.0.3 docker tag solidtestsuite/webid-provider-tests:v2.0.3 webid-provider-tests - docker pull solidtestsuite/solid-crud-tests:v5.1.0 - docker tag solidtestsuite/solid-crud-tests:v5.1.0 solid-crud-tests + docker pull solidtestsuite/solid-crud-tests:v5.2.0 + docker tag solidtestsuite/solid-crud-tests:v5.2.0 solid-crud-tests docker pull solidtestsuite/web-access-control-tests:v6.0.0 docker tag solidtestsuite/web-access-control-tests:v6.0.0 web-access-control-tests }