From 3ccbf3ce1f0c0d08f8d0201daa1f80f1b65e1b4c Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 26 Mar 2016 12:15:56 +0100 Subject: [PATCH] tox: Use -m pytest instead of -m py.test Using -m py.test seems to cause some issues, see e.g. https://github.com/The-Compiler/qutebrowser/pull/1317#issuecomment-196923033 --- tox.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index 49d59e616..38aff5cc9 100644 --- a/tox.ini +++ b/tox.ini @@ -47,7 +47,7 @@ deps = cherrypy==5.1.0 commands = {envpython} scripts/link_pyqt.py --tox {envdir} - {envpython} -m py.test {posargs:tests} + {envpython} -m pytest {posargs:tests} [testenv:py35-cov] basepython = python3.5 @@ -56,7 +56,7 @@ passenv = {[testenv]passenv} deps = {[testenv]deps} commands = {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} [testenv:py34-cov] @@ -66,7 +66,7 @@ passenv = {[testenv]passenv} deps = {[testenv]deps} commands = {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} [testenv:mkvenv] @@ -99,7 +99,7 @@ setenv = QUTE_NO_DISPLAY=1 commands = {envpython} scripts/link_pyqt.py --tox {envdir} - {envpython} -m py.test {posargs:tests} + {envpython} -m pytest {posargs:tests} [testenv:misc] ignore_errors = true