From 9766a9a2fca303e910580117b458cdd5f392da9b Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 1 Mar 2019 14:55:09 +0100
Subject: [PATCH] ci: revisit coverage reporting

This should bring coverage back that got missing with 9dcd6f2.

Continuation of #4839 / #4846.
---
 .travis.yml         |  6 +++---
 azure-pipelines.yml | 30 ++++++++++++++++++++----------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 58c7e67519d..1ac5ba88c44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
@@ -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:
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b648cd3d908..eb59c5e936d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -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'
@@ -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'