diff options
| author | holger krekel <holger@merlinux.eu> | 2015-12-07 12:41:10 +0100 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2015-12-07 12:41:10 +0100 |
| commit | 905f2c06e9b37d307562ce3cfbffb51018829a7c (patch) | |
| tree | 94bb0cdc68e739997ce176d3c40ec44b778ebc9b /tox.ini | |
| parent | b7823bfad66e0236ac161bdf3badc685c55e9683 (diff) | |
| parent | 1443960a5e6f016aa96e77a13322c5e904b31ed7 (diff) | |
| download | tox-905f2c06e9b37d307562ce3cfbffb51018829a7c.tar.gz | |
merge default
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -5,7 +5,7 @@ envlist=py27,py26,py34,py33,pypy,flakes,py26-bare commands=echo {posargs} [testenv] -commands= py.test --timeout=180 {posargs} +commands= py.test --timeout=180 {posargs:tests} deps=pytest>=2.3.5 pytest-timeout |