From 86a40d02c7fe723af8dc0c43d892a31d8de26792 Mon Sep 17 00:00:00 2001
From: EvB <erica.vonbuelow@coreos.com>
Date: Wed, 28 Dec 2016 14:22:49 -0500
Subject: [PATCH 1/4] 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

From a337e547ec5b9a72b820284665774c97f0a9996e Mon Sep 17 00:00:00 2001
From: EvB <erica.vonbuelow@coreos.com>
Date: Wed, 28 Dec 2016 14:40:08 -0500
Subject: [PATCH 2/4] chore(Dockerfile): run tests in all dirs

---
 Dockerfile | 2 +-
 setup.cfg  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 70fdbb775..7eef97df3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -159,7 +159,7 @@ RUN if [ "$RUN_TESTS" = true ]; then \
 
 RUN if [ "$RUN_TESTS" = true ]; then \
       TEST=true PYTHONPATH="." venv/bin/py.test --timeout=3600 --verbose \
-                --show-count -x --color=no test; \
+                --show-count -x --color=no; \
     fi
 
 RUN if [ "$RUN_TESTS" = true ]; then \
diff --git a/setup.cfg b/setup.cfg
index 7d9e70054..2fe4ff0bd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [tool:pytest]
 norecursedirs = .* *.egg build dist docs
-testpaths = test
+testpaths = ./
 confcutdir = test
 
 [coverage:run]

From a45a1968c9a1486538291b5a05c189ee17e64487 Mon Sep 17 00:00:00 2001
From: EvB <erica.vonbuelow@coreos.com>
Date: Wed, 28 Dec 2016 16:10:26 -0500
Subject: [PATCH 3/4] chore(setup.cfg): remove confcurdir test setting

---
 setup.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 2fe4ff0bd..fe664afff 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,6 @@
 [tool:pytest]
 norecursedirs = .* *.egg build dist docs
 testpaths = ./
-confcutdir = test
 
 [coverage:run]
 branch = True

From d4c7e6d323341aa264d617cb3efe775fa561e634 Mon Sep 17 00:00:00 2001
From: EvB <erica.vonbuelow@coreos.com>
Date: Wed, 28 Dec 2016 16:43:08 -0500
Subject: [PATCH 4/4] fix(Dockerfile): use curr dir for tests

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7eef97df3..6d46c6dee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -159,7 +159,7 @@ RUN if [ "$RUN_TESTS" = true ]; then \
 
 RUN if [ "$RUN_TESTS" = true ]; then \
       TEST=true PYTHONPATH="." venv/bin/py.test --timeout=3600 --verbose \
-                --show-count -x --color=no; \
+                --show-count -x --color=no ./; \
     fi
 
 RUN if [ "$RUN_TESTS" = true ]; then \