Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2021-01-22 16:34:02 +0300
committerVincent Petry <vincent@nextcloud.com>2021-11-05 11:48:52 +0300
commit51317a8b922bfecf4ab021ff4514b1926a118568 (patch)
treeb97b401fbfaa8d2fb4743f1c74d62c47e2da6600 /build/integration/run.sh
parent9497a7c4ff77cf44d8b1fb875070d60b6404c449 (diff)
Add integration tests for federated shares from unavailable servers
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 <danxuliu@gmail.com>
Diffstat (limited to 'build/integration/run.sh')
-rwxr-xr-xbuild/integration/run.sh6
1 files changed, 2 insertions, 4 deletions
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