From 86a40d02c7fe723af8dc0c43d892a31d8de26792 Mon Sep 17 00:00:00 2001 From: EvB Date: Wed, 28 Dec 2016 14:22:49 -0500 Subject: [PATCH] fix(Dockerfile): add timeout, remove auto distmode --- Dockerfile | 6 ++++-- requirements-tests.txt | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c11857faf..70fdbb775 100644 --- a/Dockerfile +++ b/Dockerfile @@ -158,11 +158,13 @@ RUN if [ "$RUN_TESTS" = true ]; then \ fi RUN if [ "$RUN_TESTS" = true ]; then \ - TEST=true PYTHONPATH="." venv/bin/py.test --verbose --show-count -x --color=no test ; \ + TEST=true PYTHONPATH="." venv/bin/py.test --timeout=3600 --verbose \ + --show-count -x --color=no test; \ fi RUN if [ "$RUN_TESTS" = true ]; then \ - TEST=true PYTHONPATH="." venv/bin/py.test --verbose --show-count -n auto -x --color=no test/registry_tests.py ; \ + TEST=true PYTHONPATH="." venv/bin/py.test --timeout=3600 --verbose \ + --show-count -x --color=no test/registry_tests.py ; \ fi RUN PYTHONPATH=. venv/bin/alembic heads | grep -E '^[0-9a-f]+ \(head\)$' > ALEMBIC_HEAD diff --git a/requirements-tests.txt b/requirements-tests.txt index ab476edf3..bb613f9cc 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -4,4 +4,5 @@ python-coveralls pytest-flask pytest-runner pytest-xdist +pytest-timeout -e git+https://github.com/ant31/pytest-sugar.git#egg=pytest-sugar