From a0ddec078b96d38058afb72bca79ef6827bc0ed6 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 7 May 2020 20:18:21 -0400
Subject: [PATCH] Try enabling coverage parallel feature so combine works
better
We're abusing combine to rewrite paths in the coverage data. combine isn't
intended to be used with only one coverage data file named ".coverage". So
enable parallel mode so we have only one coverage data file with the naming
scheme "combine" expects.
Maybe this gets us working path rewriting on Windows,
---
.circleci/report-coverage.sh | 4 ++--
.coveragerc | 1 +
.github/workflows/ci.yaml | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.circleci/report-coverage.sh b/.circleci/report-coverage.sh
index b8f3116..61be54a 100755
--- a/.circleci/report-coverage.sh
+++ b/.circleci/report-coverage.sh
@@ -1,7 +1,7 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p "python.withPackages (ps: [ ps.codecov ])"
-cp ./result-doc/share/doc/*/.coverage ./
-python -m coverage combine .coverage
+cp ./result-doc/share/doc/*/.coverage.* ./
+python -m coverage combine
python -m coverage report
python -m coverage xml
codecov --file coverage.xml
diff --git a/.coveragerc b/.coveragerc
index a2b0f07..9659431 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -10,3 +10,4 @@ source =
C:\hostedtoolcache\windows\Python\2.7.18\x64\Lib\site-packages\
branch = True
+parallel = True
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 0a530f0..05598a1 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -70,7 +70,7 @@ jobs:
echo "Files:"
dir
echo "Combining"
- coverage combine .coverage
+ coverage combine
echo "Reporting"
coverage report
echo "Converting to XML"
--
GitLab