summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini11
1 files changed, 5 insertions, 6 deletions
diff --git a/tox.ini b/tox.ini
index 18f1443..de69782 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,13 +11,13 @@ setenv = PIP_DISABLE_VERSION_CHECK = 1
extras = testing
commands = coverage run --source=virtualenv \
--rcfile="{toxinidir}/tox.ini" \
- {envbindir}/pytest tests
+ -m pytest tests \
{posargs:\
- --junitxml={env:JUNIT_XML_FILE:{toxworkdir}/.test.{envname}.xml}
+ --junitxml={env:JUNIT_XML_FILE:{toxworkdir}/.test.{envname}.xml} \
!jython: --timeout=180 \
}
coverage combine --rcfile="{toxinidir}/tox.ini"
- !jython: coverage report -m --rcfile="{toxinidir}/tox.ini"
+ !jython: coverage report --show-missing --rcfile="{toxinidir}/tox.ini"
[testenv:.package]
deps =
@@ -47,8 +47,7 @@ extras =
skip_install = True
passenv = DIFF_AGAINST
setenv = COVERAGE_FILE={toxworkdir}/.coverage
-commands = coverage erase --rcfile="{toxinidir}/tox.ini"
- coverage combine --rcfile="{toxinidir}/tox.ini"
+commands = coverage combine --rcfile="{toxinidir}/tox.ini"
coverage report --show-missing --rcfile="{toxinidir}/tox.ini"
coverage xml -o {toxworkdir}/coverage.xml --rcfile="{toxinidir}/tox.ini"
coverage html -d {toxworkdir}/htmlcov --rcfile="{toxinidir}/tox.ini"
@@ -113,7 +112,7 @@ force_grid_wrap = 0
line_length = 120
known_standard_library = ConfigParser
known_first_party = virtualenv
-known_third_party = mock,pytest
+known_third_party = pytest
[flake8]
max-complexity = 22