summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2015-05-11 12:06:39 +0200
committerholger krekel <holger@merlinux.eu>2015-05-11 12:06:39 +0200
commit097438b8a986bcba6820f930d875dc2b4b1e3bb1 (patch)
treefe743836073316c19ef08c347aa10e697753931f /tox.ini
parent0a29364f4890691dc1979f694fc924c441ac65e9 (diff)
downloadtox-097438b8a986bcba6820f930d875dc2b4b1e3bb1.tar.gz
refactor testenv section parser to work by registering ini attributes
at tox_addoption() time. Introduce new "--help-ini" or "--hi" option to show all testenv variables.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini9
1 files changed, 5 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index 607add9..2214c7d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,8 +5,10 @@ envlist=py27,py26,py34,py33,pypy,flakes
commands=echo {posargs}
[testenv]
-commands=py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
+commands= py.test --timeout=60 {posargs}
+
deps=pytest>=2.3.5
+ pytest-timeout
[testenv:docs]
basepython=python
@@ -14,11 +16,10 @@ changedir=doc
deps=sphinx
{[testenv]deps}
commands=
- py.test -v \
- --junitxml={envlogdir}/junit-{envname}.xml \
- check_sphinx.py {posargs}
+ py.test -v check_sphinx.py {posargs}
[testenv:flakes]
+qwe = 123
deps = pytest-flakes>=0.2
pytest-pep8