py.test timeout and capture log

10 years ago · 4b62d4d82c
parent f682e1c474
commit 4b62d4d82c
2 changed files with 4 additions and 1 deletions
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@ -4,3 +4,6 @@ sphinx==1.2.3
 pytest==2.6.4
 ws4py==0.3.4
 pep8==1.5.7
+pytest
+pytest-timeout
+pytest-capturelog
--- a/tox.ini
+++ b/tox.ini
@ -10,4 +10,4 @@ ignore = E501

 [pytest]
 norecursedirs = old_tests .tox
-
+timeout = 10