squash! Travis: report coverage with all builds

doctesting: remove changedir

With coverage 5 we could use COVERAGE_RCFILE to make it find the
.coveragerc, or we could add `--rcfile` to _PYTEST_TOX_COVERAGE_RUN, but
I've thought that this should not be the job that has to test if
`--pyargs` actually works.
This commit is contained in:
Daniel Hahler 2018-08-29 20:05:31 +02:00
parent f730291e67
commit 417516c378
2 changed files with 5 additions and 8 deletions

View File

@ -81,9 +81,8 @@ jobs:
before_script: before_script:
- | - |
if [[ "$PYTEST_NO_COVERAGE" != 1 ]]; then if [[ "$PYTEST_NO_COVERAGE" != 1 ]]; then
export _PYTEST_TOX_COVERAGE_RUN="env COVERAGE_FILE=$PWD/.coverage coverage run --source {envsitepackagesdir}/_pytest/,$PWD/testing -m" export _PYTEST_TOX_COVERAGE_RUN="env COVERAGE_FILE=$PWD/.coverage COVERAGE_PROCESS_START=$PWD/.coveragerc coverage run --source {envsitepackagesdir}/_pytest/,$PWD/testing -m"
export _PYTEST_TOX_EXTRA_DEP=coverage-enable-subprocess export _PYTEST_TOX_EXTRA_DEP=coverage-enable-subprocess
export COVERAGE_PROCESS_START="$PWD/.coveragerc"
fi fi
script: tox --recreate script: tox --recreate

10
tox.ini
View File

@ -21,11 +21,11 @@ commands =
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest --lsof -ra {env:_PYTEST_TEST_OPTS:} {posargs:testing} {env:_PYTEST_TOX_COVERAGE_RUN:} pytest --lsof -ra {env:_PYTEST_TEST_OPTS:} {posargs:testing}
coverage: coverage report -m --skip-covered coverage: coverage report -m --skip-covered
setenv = setenv =
coverage: _PYTEST_TOX_COVERAGE_RUN=coverage run -a -m coverage: _PYTEST_TOX_COVERAGE_RUN=coverage run -m
coverage: _PYTEST_TOX_EXTRA_DEP=coverage-enable-subprocesses coverage: _PYTEST_TOX_EXTRA_DEP=coverage-enable-subprocess
coverage: COVERAGE_FILE={toxinidir}/.coverage coverage: COVERAGE_FILE={toxinidir}/.coverage
coverage: COVERAGE_PROCESS_START={toxinidir}/.coveragerc coverage: COVERAGE_PROCESS_START={toxinidir}/.coveragerc
passenv = USER USERNAME COVERAGE_PROCESS_START passenv = USER USERNAME
deps = deps =
hypothesis>=3.56 hypothesis>=3.56
nose nose
@ -142,13 +142,11 @@ commands =
[testenv:doctesting] [testenv:doctesting]
basepython = python basepython = python
skipsdist = True skipsdist = True
# ensure the given pyargs can't mean anything else
changedir = doc/
deps = deps =
PyYAML PyYAML
{env:_PYTEST_TOX_EXTRA_DEP:} {env:_PYTEST_TOX_EXTRA_DEP:}
commands = commands =
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -ra en {env:_PYTEST_TOX_COVERAGE_RUN:} pytest -ra doc/en
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest --doctest-modules --pyargs _pytest {env:_PYTEST_TOX_COVERAGE_RUN:} pytest --doctest-modules --pyargs _pytest
[testenv:regen] [testenv:regen]