ci(integration): kill servers softly

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
nextcloud · Jun 24, 2024 · 53efda0 · 53efda0
1 parent 0b5d245
commit 53efda0
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/tests/integration/run.sh b/tests/integration/run.sh
@@ -81,10 +81,19 @@ echo ''
 echo '#'
 echo '# Stopping PHP webserver and disabling spreedcheats'
 echo '#'
-kill $PHPPID1
-kill $PHPPID2
 
-wait $PHPPID1
-wait $PHPPID2
+if ps --pid ${PHPPID1} > /dev/null; then
+	kill ${PHPPID1}
+fi
+if ps --pid ${PHPPID2} > /dev/null; then
+	kill ${PHPPID2}
+fi
+
+if ps --pid ${PHPPID1} > /dev/null; then
+	wait ${PHPPID1}
+fi
+if ps --pid ${PHPPID2} > /dev/null; then
+	wait ${PHPPID2} || true
+fi
 
 exit $RESULT