summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2015-05-12 14:01:28 +0200
committerholger krekel <holger@merlinux.eu>2015-05-12 14:01:28 +0200
commit904844849ae03baab8d37b87267aed27c55e8db0 (patch)
tree40fffd7df8d2119ecb2b0c8710c65d2724ce63a3 /tox.ini
parent7549cce84c52115e0b8f47737753698579a6ac0b (diff)
downloadtox-904844849ae03baab8d37b87267aed27c55e8db0.tar.gz
- store and show information about what is installed in each venv
- rename internal methods to accomodate the fact that we are not only installing sdist's
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 2214c7d..4f8b49c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist=py27,py26,py34,py33,pypy,flakes
commands=echo {posargs}
[testenv]
-commands= py.test --timeout=60 {posargs}
+commands= py.test --timeout=180 {posargs}
deps=pytest>=2.3.5
pytest-timeout