vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2262 from coreos-inc/TEST-timeout

Browse source 
fix(Dockerfile): add timeout, remove auto distmode
This commit is contained in:
Erica 2016-12-29 14:55:19 -05:00 • committed by GitHub
commit 6513d7085d
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Dockerfile
View file

@ -158,11 +158,13 @@ RUN if [ "$RUN_TESTS" = true ]; then \
fi fi
RUN if [ "$RUN_TESTS" = true ]; then \ 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 ./; \
fi fi
RUN if [ "$RUN_TESTS" = true ]; then \ 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 fi
RUN PYTHONPATH=. venv/bin/alembic heads | grep -E '^[0-9a-f]+ \(head\)$' > ALEMBIC_HEAD RUN PYTHONPATH=. venv/bin/alembic heads | grep -E '^[0-9a-f]+ \(head\)$' > ALEMBIC_HEAD

1
requirements-tests.txt
View file

@ -4,4 +4,5 @@ python-coveralls
pytest-flask pytest-flask
pytest-runner pytest-runner
pytest-xdist pytest-xdist
pytest-timeout
-e git+https://github.com/ant31/pytest-sugar.git#egg=pytest-sugar -e git+https://github.com/ant31/pytest-sugar.git#egg=pytest-sugar

3
setup.cfg
View file

@ -1,7 +1,6 @@
[tool:pytest] [tool:pytest]
norecursedirs = .* *.egg build dist docs norecursedirs = .* *.egg build dist docs
testpaths = test testpaths = ./
confcutdir = test
[coverage:run] [coverage:run]
branch = True branch = True