From 0babbde00edac92b5a62560245353c110183ffa6 Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Fri, 10 Jul 2020 19:11:36 +0200
Subject: [PATCH] ci: fix test results not being merged correctly

---
 azure-pipelines.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8e1d66b31..9c7574747 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -226,15 +226,21 @@ stages:
                 pipenv run coverage combine coverage-e2e/coverage coverage-unittest/coverage
                 pipenv run coverage xml
                 pipenv run coverage html
+                find .
           - task: PublishCodeCoverageResults@1
             inputs:
-              codeCoverageTool: Cobertura
+              codeCoverageTool: 'Cobertura'
               summaryFileLocation: 'coverage.xml'
+              pathToSources: '$(System.DefaultWorkingDirectory)'
+              reportDirectory: 'htmlcov'
           - task: PublishTestResults@2
             condition: succeededOrFailed()
             inputs:
-              testRunTitle: 'Publish test results for Python $(python.version)'
-              testResultsFiles: 'coverage-e2e/unittest.xml:coverage-unittest/unittest.xml'
+              testResultsFormat: 'JUnit'
+              testResultsFiles: |
+                coverage-e2e/unittest.xml
+                coverage-unittest/unittest.xml
+              mergeTestResults: true
           - task: CmdLine@2
             env:
               CODECOV_TOKEN: $(CODECOV_TOKEN)