Skip to content

Commit

Permalink
ci: revisit coverage reporting
Browse files Browse the repository at this point in the history
This should bring coverage back that got missing with 9dcd6f2.

Continuation of pytest-dev#4839 / pytest-dev#4846.
  • Loading branch information
blueyed committed Mar 1, 2019
1 parent 0dd4cb0 commit 24909d9
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ install:
- python -m pip install --upgrade --pre tox
env:
matrix:
- TOXENV=py27 PYTEST_COVERAGE=1
- TOXENV=py27
# Specialized factors for py27.
- TOXENV=py27-nobyte-numpy-xdist PYTEST_COVERAGE=1
- TOXENV=py27-nobyte-numpy-xdist
- TOXENV=py27-pluggymaster-xdist
# Specialized factors for py37.
- TOXENV=py37-pexpect,py37-trial
Expand Down Expand Up @@ -45,10 +45,10 @@ jobs:
os: osx
osx_image: xcode10.1
language: generic
env: TOXENV=py27-xdist
before_install:
- python -V
- test $(python -c 'import sys; print("%d%d" % sys.version_info[0:2])') = 27
env: TOXENV=py27-xdist
- <<: *test-macos
env: TOXENV=py37-xdist
before_install:
Expand Down
30 changes: 20 additions & 10 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,22 @@ jobs:
py27:
python.version: '2.7'
tox.env: 'py27'
PYTEST_COVERAGE: '1'
py27-nobyte-numpy-xdist:
python.version: '2.7'
tox.env: 'py27-nobyte-numpy-xdist'
# Coverage for:
# - test_supports_breakpoint_module_global
# - test_terminal_reporter_writer_attr (without xdist)
# - "if write" branch in _pytest.assertion.rewrite
# - also for more stable(?) isatty in _pytest.terminal
# (according to https://codecov.io/gh/pytest-dev/pytest/pull/4858/src/src/_pytest/terminal.py).
PYTEST_COVERAGE: '1'
py27-trial:
python.version: '2.7'
tox.env: 'py27-trial'
python.needs_vc: True
# Coverage for:
# - twisted support - not verified though.
PYTEST_COVERAGE: '1'
py27-pluggymaster-xdist:
python.version: '2.7'
Expand All @@ -37,33 +44,36 @@ jobs:
python.version: 'pypy'
tox.env: 'pypy'
python.exe: 'pypy'
py34:
py34-xdist:
python.version: '3.4'
tox.env: 'py34'
tox.env: 'py34-xdist'
# Coverage for:
# - _pytest.compat._bytes_to_ascii
PYTEST_COVERAGE: '1'
py35:
py35-xdist:
python.version: '3.5'
tox.env: 'py35'
tox.env: 'py35-xdist'
# Coverage for:
# - test_supports_breakpoint_module_global
PYTEST_COVERAGE: '1'
py36:
py36-xdist:
python.version: '3.6'
tox.env: 'py36'
tox.env: 'py36-xdist'
# Coverage for:
# - _py36_windowsconsoleio_workaround (could also be py36+)
PYTEST_COVERAGE: '1'
py37:
python.version: '3.7'
tox.env: 'py37'
PYTEST_COVERAGE: '1'
py37-linting/docs/doctesting:
python.version: '3.7'
tox.env: 'linting,docs,doctesting'
py37-xdist:
python.version: '3.7'
tox.env: 'py37-xdist'
PYTEST_COVERAGE: '1'
py37-trial/numpy:
python.version: '3.7'
tox.env: 'py37-trial,py37-numpy'
PYTEST_COVERAGE: '1'
py37-pluggymaster-xdist:
python.version: '3.7'
tox.env: 'py37-pluggymaster-xdist'
Expand Down

0 comments on commit 24909d9

Please sign in to comment.