rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tox: Use -m pytest instead of -m py.test

Browse Source 
Using -m py.test seems to cause some issues, see e.g.
https://github.com/The-Compiler/qutebrowser/pull/1317#issuecomment-196923033
This commit is contained in:
Florian Bruhin 2016-03-26 12:15:56 +01:00
parent 387e35d3e5
commit 3ccbf3ce1f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tox.ini
View File

@ -47,7 +47,7 @@ deps =
cherrypy==5.1.0 cherrypy==5.1.0
commands = commands =
{envpython} scripts/link_pyqt.py --tox {envdir} {envpython} scripts/link_pyqt.py --tox {envdir}
{envpython} -m py.test {posargs:tests} {envpython} -m pytest {posargs:tests}
[testenv:py35-cov] [testenv:py35-cov]
basepython = python3.5 basepython = python3.5
@ -56,7 +56,7 @@ passenv = {[testenv]passenv}
deps = {[testenv]deps} deps = {[testenv]deps}
commands = commands =
{envpython} scripts/link_pyqt.py --tox {envdir} {envpython} scripts/link_pyqt.py --tox {envdir}
{envpython} -m py.test --cov --cov-report xml --cov-report=html --cov-report= {posargs:tests} {envpython} -m pytest --cov --cov-report xml --cov-report=html --cov-report= {posargs:tests}
{envpython} scripts/dev/check_coverage.py {posargs} {envpython} scripts/dev/check_coverage.py {posargs}
[testenv:py34-cov] [testenv:py34-cov]
@ -66,7 +66,7 @@ passenv = {[testenv]passenv}
deps = {[testenv]deps} deps = {[testenv]deps}
commands = commands =
{envpython} scripts/link_pyqt.py --tox {envdir} {envpython} scripts/link_pyqt.py --tox {envdir}
{envpython} -m py.test --cov --cov-report xml --cov-report=html --cov-report= {posargs:tests} {envpython} -m pytest --cov --cov-report xml --cov-report=html --cov-report= {posargs:tests}
{envpython} scripts/dev/check_coverage.py {posargs} {envpython} scripts/dev/check_coverage.py {posargs}
[testenv:mkvenv] [testenv:mkvenv]
@ -99,7 +99,7 @@ setenv =
QUTE_NO_DISPLAY=1 QUTE_NO_DISPLAY=1
commands = commands =
{envpython} scripts/link_pyqt.py --tox {envdir} {envpython} scripts/link_pyqt.py --tox {envdir}
{envpython} -m py.test {posargs:tests} {envpython} -m pytest {posargs:tests}
[testenv:misc] [testenv:misc]
ignore_errors = true ignore_errors = true