From 51317a8b922bfecf4ab021ff4514b1926a118568 Mon Sep 17 00:00:00 2001 From: Daniel Calviño Sánchez Date: Fri, 22 Jan 2021 14:34:02 +0100 Subject: Add integration tests for federated shares from unavailable servers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The federated server needs to be stopped during the tests, so it is now stopped in the FederationContext for each scenario instead of just once in the run.sh script. Signed-off-by: Daniel Calviño Sánchez --- build/integration/run.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'build/integration/run.sh') diff --git a/build/integration/run.sh b/build/integration/run.sh index 4808ab58ef5..a20398e8ee9 100755 --- a/build/integration/run.sh +++ b/build/integration/run.sh @@ -38,11 +38,10 @@ php -S localhost:$PORT -t ../.. & PHPPID=$! echo $PHPPID +# The federated server is started and stopped by the tests themselves PORT_FED=$((8180 + $EXECUTOR_NUMBER)) echo $PORT_FED -php -S localhost:$PORT_FED -t ../.. & -PHPPID_FED=$! -echo $PHPPID_FED +export PORT_FED export TEST_SERVER_URL="http://localhost:$PORT/ocs/" export TEST_SERVER_FED_URL="http://localhost:$PORT_FED/ocs/" @@ -65,7 +64,6 @@ vendor/bin/behat --strict -f junit -f pretty $TAGS $SCENARIO_TO_RUN RESULT=$? kill $PHPPID -kill $PHPPID_FED if [ "$INSTALLED" == "true" ]; then -- cgit v1.2.3