From be0fd9a446f1f0a01170b52610f5774129e7351a Mon Sep 17 00:00:00 2001 From: Hayden Faulds Date: Tue, 5 Jun 2018 11:30:48 +0100 Subject: [PATCH] reduce container teardown timeout to 0 --- services/web/Makefile | 6 +++--- services/web/Makefile.module | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/web/Makefile b/services/web/Makefile index 469ab8e919..bfdfc0f52f 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -180,7 +180,7 @@ clean_css: rm -f public/stylesheets/*.css* clean_ci: - docker-compose down -v + docker-compose down -v -t 0 test: test_unit test_frontend test_acceptance @@ -204,7 +204,7 @@ test_acceptance_app_start_service: test_clean # stop service and clear dbs docker-compose ${DOCKER_COMPOSE_FLAGS} up -d test_acceptance test_acceptance_app_stop_service: - docker-compose ${DOCKER_COMPOSE_FLAGS} stop test_acceptance redis mongo + docker-compose ${DOCKER_COMPOSE_FLAGS} stop -t 0 test_acceptance redis mongo test_acceptance_app_run: docker-compose ${DOCKER_COMPOSE_FLAGS} exec -T test_acceptance npm -q run test:acceptance -- ${MOCHA_ARGS} @@ -224,7 +224,7 @@ test_acceptance_module: $(MODULE_MAKEFILES) fi test_clean: - docker-compose ${DOCKER_COMPOSE_FLAGS} down -v + docker-compose ${DOCKER_COMPOSE_FLAGS} down -v -t 0 ci: MOCHA_ARGS="--reporter tap" \ diff --git a/services/web/Makefile.module b/services/web/Makefile.module index 00bea5f8da..fa1ba41679 100644 --- a/services/web/Makefile.module +++ b/services/web/Makefile.module @@ -62,7 +62,7 @@ test_acceptance_start_service: test_acceptance_stop_service $(DOCKER_COMPOSE) up -d test_acceptance test_acceptance_stop_service: - $(DOCKER_COMPOSE) stop test_acceptance redis mongo + $(DOCKER_COMPOSE) stop -t 0 test_acceptance redis mongo test_acceptance_run: $(DOCKER_COMPOSE) exec -T test_acceptance npm -q run test:acceptance:dir -- ${MOCHA_ARGS} $(MODULE_DIR)/test/acceptance/js