Bladeren bron

Merge pull request #654 from sharelatex/ja-explain-error-on-crash

Explain error if web crashes in acceptance tests
James Allen 8 jaren geleden
bovenliggende
commit
e162ff6256
1 gewijzigde bestanden met toevoegingen van 5 en 1 verwijderingen
  1. 5 1
      services/web/Makefile

+ 5 - 1
services/web/Makefile

@@ -207,7 +207,11 @@ test_acceptance_app_stop_service:
 	docker-compose ${DOCKER_COMPOSE_FLAGS} stop -t 0 test_acceptance redis mongo
 	docker-compose ${DOCKER_COMPOSE_FLAGS} stop -t 0 test_acceptance redis mongo
 
 
 test_acceptance_app_run:
 test_acceptance_app_run:
-	docker-compose ${DOCKER_COMPOSE_FLAGS} exec -T test_acceptance npm -q run test:acceptance -- ${MOCHA_ARGS}
+	@docker-compose ${DOCKER_COMPOSE_FLAGS} exec -T test_acceptance npm -q run test:acceptance -- ${MOCHA_ARGS}; \
+	if [ $$? -eq 137 ]; then \
+		echo "\nOh dear, it looks like the web process crashed! To see why, run:\n\n\tdocker-compose logs test_acceptance\n"; \
+		exit 1; \
+	fi
 
 
 test_acceptance_modules:
 test_acceptance_modules:
 	@set -e; \
 	@set -e; \