diff --git a/tests/randomized/lib/run-base-docker-compose.sh b/tests/randomized/lib/run-base-docker-compose.sh index 62a4e375367..8c007d6503f 100755 --- a/tests/randomized/lib/run-base-docker-compose.sh +++ b/tests/randomized/lib/run-base-docker-compose.sh @@ -10,7 +10,7 @@ while true; do if [[ ${1:-} == shutdown ]]; then # check for running tests; in that case don't shutdown if ! docker network ls | grep -q randomized-; then - sleep 10 + sleep 3 # prevent race conditions if ! docker network ls | grep -q randomized-; then docker-compose down diff --git a/tests/randomized/lib/templates/Makefile.scenario.template b/tests/randomized/lib/templates/Makefile.scenario.template index 4649e5ae813..0480485e80d 100644 --- a/tests/randomized/lib/templates/Makefile.scenario.template +++ b/tests/randomized/lib/templates/Makefile.scenario.template @@ -4,9 +4,13 @@ SCENARIO := {{scenario_name}} run: prepare_results_folders @SCENARIO=$(SCENARIO) bash ../../lib/run-base-docker-compose.sh + sleep 1 @DURATION=$(DURATION) docker-compose up php-test-$(SCENARIO) + sleep 1 @docker-compose down + sleep 1 @SCENARIO=$(SCENARIO) bash ../../lib/run-base-docker-compose.sh shutdown + sleep 1 shell: prepare_results_folders @SCENARIO=$(SCENARIO) bash ../../lib/run-base-docker-compose.sh