upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

test(integration): Correctly cleanup logs

Browse source 
Signed-off-by: provokateurin <kate@provokateurin.de>
This commit is contained in:
provokateurin 2024-11-14 08:12:20 +01:00
parent dfa7e7edea
commit fc0c61458e
No known key found for this signature in database
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
build/integration/run.sh
View file

@ -39,6 +39,7 @@ fi
PORT=$((8080 + $EXECUTOR_NUMBER))
echo $PORT
echo "" > "${NC_DATADIR}/nextcloud.log"
echo "" > phpserver.log
PHP_CLI_SERVER_WORKERS=2 php -S localhost:$PORT -t ../.. &> phpserver.log &
@ -47,6 +48,14 @@ echo $PHPPID
# Output filtered php server logs
tail -f phpserver.log | grep --line-buffered -v -E ":[0-9]+ Accepted$" | grep --line-buffered -v -E ":[0-9]+ Closing$" &
LOGPID=$!
echo $LOGPID
function cleanup() {
kill $PHPPID
kill $LOGPID
}
trap cleanup EXIT
# The federated server is started and stopped by the tests themselves
PORT_FED=$((8180 + $EXECUTOR_NUMBER))
@ -73,8 +82,6 @@ fi
vendor/bin/behat --strict --colors -f junit -f pretty $TAGS $SCENARIO_TO_RUN
RESULT=$?
kill $PHPPID
if [ "$INSTALLED" == "true" ]; then
$OCC files_external:delete -y $ID_STORAGE