diff --git a/server-ce/test/Makefile b/server-ce/test/Makefile index b6c57bcf01..9586b101cf 100644 --- a/server-ce/test/Makefile +++ b/server-ce/test/Makefile @@ -25,13 +25,13 @@ test-e2e-native: test-e2e: docker compose build host-admin docker compose up --detach --wait host-admin - docker compose up --detach --wait mongo || { docker compose logs mongo; exit 42; } - docker compose up --no-log-prefix --exit-code-from=e2e e2e host-admin || { docker compose logs mongo; exit 42; } + docker compose up --detach --wait mongo + docker compose up --no-log-prefix --exit-code-from=e2e e2e host-admin test-e2e-open: docker compose up --detach --wait host-admin - docker compose up --detach --wait mongo || { docker compose logs mongo; exit 42; } - docker compose up --no-log-prefix --exit-code-from=e2e-open e2e-open host-admin || { docker compose logs mongo; exit 42; } + docker compose up --detach --wait mongo + docker compose up --no-log-prefix --exit-code-from=e2e-open e2e-open host-admin SHARD_PROJECT_NAMES = \ test-ce-default \ diff --git a/services/web/Makefile b/services/web/Makefile index 9a9ea79d38..35faba7407 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -142,7 +142,7 @@ test_unit_module: mongo_migrations_for_tests $(MAKE) modules/$(MODULE_NAME)/test_unit mongo_migrations_for_tests: - $(DOCKER_COMPOSE) run --rm test_unit npm run migrations -- migrate -t saas || { $(DOCKER_COMPOSE) logs mongo; exit 42; } + $(DOCKER_COMPOSE) run --rm test_unit npm run migrations -- migrate -t saas # # Frontend tests @@ -222,7 +222,7 @@ test_acceptance_app_server_pro: export COMPOSE_PROJECT_NAME=acceptance_test_serv test_acceptance_app_server_pro: export OVERLEAF_CONFIG=$(CFG_SERVER_PRO) $(TEST_ACCEPTANCE_APP): - $(DOCKER_COMPOSE) run --rm test_acceptance || { $(DOCKER_COMPOSE) logs mongo; exit 42; } + $(DOCKER_COMPOSE) run --rm test_acceptance $(DOCKER_COMPOSE) down -v -t 0 # We are using _make magic_ for turning these file-targets into calls to @@ -369,7 +369,7 @@ TEST_ACCEPTANCE_MODULES_MERGED_VARIANTS = \ test_acceptance_modules_merged_server_pro \ $(TEST_ACCEPTANCE_MODULES_MERGED_VARIANTS): - $(DOCKER_COMPOSE) run --rm test_acceptance make test_acceptance_modules_merged_inner || { $(DOCKER_COMPOSE) logs mongo; exit 42; } + $(DOCKER_COMPOSE) run --rm test_acceptance make test_acceptance_modules_merged_inner $(DOCKER_COMPOSE) down -v -t 0 # outer loop for running saas tests in parallel @@ -390,7 +390,7 @@ test_acceptance_modules_merged_saas_4: export COMPOSE_PROJECT_NAME = \ $(TEST_ACCEPTANCE_MODULES_MERGED_SPLIT_SAAS): export BASE_CONFIG = $(CFG_SAAS) $(TEST_ACCEPTANCE_MODULES_MERGED_SPLIT_SAAS): test_acceptance_modules_merged_saas_%: - $(DOCKER_COMPOSE) run --rm test_acceptance make test_acceptance_modules_merged_inner_$* || { $(DOCKER_COMPOSE) logs mongo; exit 42; } + $(DOCKER_COMPOSE) run --rm test_acceptance make test_acceptance_modules_merged_inner_$* $(DOCKER_COMPOSE) down -v -t 0 test_acceptance_modules: $(TEST_ACCEPTANCE_MODULES_MERGED_VARIANTS)