py.test timeout and capture log

This commit is contained in:
Julien Duponchelle committed 2015-01-28 15:57:11 +01:00
1 parent f682e1c474
commit 4b62d4d82c
2 files changed
+4 -1

No files matched your search

+3
View File
@@ -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
+1 -1
View File
@@ -10,4 +10,4 @@ ignore = E501
[pytest]
norecursedirs = old_tests .tox
timeout = 10