Coverage: Fix providing coverage data for upload from GitHub CI

Signed-off-by: Bernhard Kaindl <[email protected]>

Author: bernhardkaindl

tox.ini

@@ -33,7 +33,9 @@ commands    =
     # https://github.com/actions/toolkit/blob/main/docs/problem-matchers.md
     # https://github.com/actions/toolkit/blob/main/docs/commands.md#problem-matchers
     echo "::add-matcher::.github/workflows/PYTHONWARNINGS-problemMatcher.json"
-    pytest --cov -v --new-first -x --show-capture=all -rA
+    echo "::group::pytest"
+    pytest --cov -v --new-first -x --show-capture=all -rA --junitxml={envlogdir}/junit.xml -o junit_family=legacy
+    echo "::endgroup::"
     sh -c 'if [ -n "{env:PYTEST_MD_REPORT_OUTPUT}" -a -n "{env:GITHUB_STEP_SUMMARY}" ];then    \
       mkdir -p $(dirname "{env:GITHUB_STEP_SUMMARY:.git/sum.md}");                             \
       sed "s/tests\(.*py\)/[&](&)/"                                                            \
@@ -81,6 +83,9 @@ passenv =
     pytype: GITHUB_REF_NAME
     test: PYTEST_ADDOPTS
     test: PYTEST_XDIST_WORKER_COUNT
+    cov: TESTS_COVERAGE_MIN
+    cov: XCP_COVERAGE_MIN
+    cov: DIFF_COVERAGE_MIN
     covcp: UPLOAD_DIR
     covcp: HOME
     check: MYPY_FORCE_COLOR
@@ -114,7 +119,7 @@ commands =
     # covcombine shall not call [cov]commands: diff-cover shall check the combined cov:
     {cov,covcp}: {[cov]commands}
     {py27-test}: pylint --py3k --disable=no-absolute-import xcp/
-    covcp: cp -av {envlogdir}/coverage.xml {env:UPLOAD_DIR:.}
+    covcp: cp -av {envlogdir}/coverage.xml {envlogdir}/coverage.lcov {envlogdir}/.coverage {envlogdir}/junit.xml {env:UPLOAD_DIR:.}
     covcombine: {[covcombine]commands}
     fox: {[covcombine]commands}
     fox: {[lint]commands}
@@ -127,12 +132,13 @@ setenv      = PY3_DIFFCOVER_OPTIONS=--ignore-whitespace --show-uncovered
 extras      = coverage
     test
 commands    =
-    coverage xml  -o {envlogdir}/coverage.xml  --fail-under {env:XCP_COV_MIN:68}
+    coverage xml  -o {envlogdir}/coverage.xml  --fail-under {env:XCP_COVERAGE_MIN:78}
+    coverage lcov -o {envlogdir}/coverage.lcov
     coverage html -d {envlogdir}/htmlcov
-    coverage html -d {envlogdir}/htmlcov-tests --fail-under {env:TESTS_COV_MIN:96}    \
+    coverage html -d {envlogdir}/htmlcov-tests --fail-under {env:TESTS_COVERAGE_MIN:96} \
                       --include="tests/*"
-    diff-cover --compare-branch=origin/master                                         \
-      {env:PY3_DIFFCOVER_OPTIONS} --fail-under {env:DIFF_COV_MIN:92}                  \
+    diff-cover --compare-branch=origin/master --exclude xcp/dmv.py                    \
+      {env:PY3_DIFFCOVER_OPTIONS} --fail-under {env:DIFF_COVERAGE_MIN:92}             \
       --html-report  {envlogdir}/coverage-diff.html                                   \
                      {envlogdir}/coverage.xml