github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-27 23:51:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #625 from sharelatex/hof-container-teardown-timeout

Browse source 
reduce acceptance test container teardown timeout to 0
This commit is contained in:
Hayden Faulds 2018-06-07 11:50:16 +01:00 committed by GitHub
commit 87f6c65b99
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/web/Makefile
View file

@ -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" \

2
services/web/Makefile.module
View file

@ -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