From 7e4d1df0e5e6e1b56edff5d407eaae7a3e01b019 Mon Sep 17 00:00:00 2001 From: EvB Date: Thu, 29 Dec 2016 17:02:35 -0500 Subject: [PATCH 1/2] fix(setup.cfg): exclude ext test dirs --- setup.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index fe664afff..636bdd178 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,7 @@ [tool:pytest] -norecursedirs = .* *.egg build dist docs +norecursedirs = .* *.egg build dist docs bin boot core dev etc home lib lib64 media mnt node_modules opt proc root run sbin srv sys tmp usr var venv testpaths = ./ +python_files = **/test/*.py test/**.py [coverage:run] branch = True From 954d82ff8b983b04b32dd146ea209376a9748148 Mon Sep 17 00:00:00 2001 From: EvB Date: Thu, 29 Dec 2016 18:36:59 -0500 Subject: [PATCH 2/2] chore(Dockerfile): up timeout on tests to 2h --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d46c6dee..5a8d54fb8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -157,13 +157,14 @@ RUN if [ "$RUN_TESTS" = true ]; then \ venv/bin/pip install -r requirements-tests.txt ;\ fi + RUN if [ "$RUN_TESTS" = true ]; then \ - TEST=true PYTHONPATH="." venv/bin/py.test --timeout=3600 --verbose \ + TEST=true PYTHONPATH="." venv/bin/py.test --timeout=7200 --verbose \ --show-count -x --color=no ./; \ fi RUN if [ "$RUN_TESTS" = true ]; then \ - TEST=true PYTHONPATH="." venv/bin/py.test --timeout=3600 --verbose \ + TEST=true PYTHONPATH="." venv/bin/py.test --timeout=7200 --verbose \ --show-count -x --color=no test/registry_tests.py ; \ fi