VSTS build improvements (#960)

* Enable code coverage reports and fix test environment names

* Fix coverage option

* Skip codecov upload when no token is available.

.vsts-ci.yml

@@ -85,8 +85,9 @@ jobs:
     inputs:
       testResultsFiles: '.tox/test-results.*.xml'
       mergeTestResults: true
-      testRunTitle: '$(toxenv)'
+      testRunTitle: '$(agent.os) py$(python.version)'
       platform: linux
+    condition: succeededOrFailed()
 
   - script: 'python -m tox -e coverage'
     displayName: generate coverage.xml
@@ -98,10 +99,12 @@ jobs:
     inputs:
       codeCoverageTool: 'cobertura'
       summaryFileLocation: '$(System.DefaultWorkingDirectory)/.tox/coverage.xml'
+      reportDirectory: '$(System.DefaultWorkingDirectory)/.tox/htmlcov'
       failIfCoverageEmpty: true
 
   - script: 'python -m tox -e codecov -- -t $(CODECOV_TOKEN) --required -n "$(agent.os)-$(python.version)" --build "$(Build.DefinitionName)" --env OS=$(agent.os) python=$(python.version)'
     displayName: upload codecov
+    condition: and(succeeded(), variables['CODECOV_TOKEN'])
 
 - job: windows
   pool:
@@ -140,8 +143,9 @@ jobs:
     inputs:
       testResultsFiles: '.tox/test-results.*.xml'
       mergeTestResults: true
-      testRunTitle: '$(toxenv)'
+      testRunTitle: '$(agent.os) py$(python.version)'
       platform: windows
+    condition: succeededOrFailed()
 
   - script: 'python -m tox -e coverage'
     displayName: generate coverage.xml
@@ -150,10 +154,12 @@ jobs:
     inputs:
       codeCoverageTool: 'cobertura'
       summaryFileLocation: '$(System.DefaultWorkingDirectory)/.tox/coverage.xml'
+      reportDirectory: '$(System.DefaultWorkingDirectory)/.tox/htmlcov'
       failIfCoverageEmpty: true
 
   - script: 'python -m tox -e codecov -- -t $(CODECOV_TOKEN) --required -n "$(agent.os)-$(python.version)" --build "$(Build.DefinitionName)" --env OS=$(agent.os) python=$(python.version)'
     displayName: upload codecov
+    condition: and(succeeded(), variables['CODECOV_TOKEN'])
 
 - job: macOS
   pool:
@@ -180,7 +186,8 @@ jobs:
       testResultsFiles: '.tox/test-results.*.xml'
       mergeTestResults: true
       testRunTitle: '$(toxenv)'
-      platform: windows
+      platform: macos
+    condition: succeededOrFailed()
 
   - script: 'python3 -m tox -e coverage'
     displayName: generate coverage.xml
@@ -189,10 +196,12 @@ jobs:
     inputs:
       codeCoverageTool: 'cobertura'
       summaryFileLocation: '$(System.DefaultWorkingDirectory)/.tox/coverage.xml'
+      reportDirectory: '$(System.DefaultWorkingDirectory)/.tox/htmlcov'
       failIfCoverageEmpty: true
 
   - script: 'python3 -m tox -e codecov -- -t $(CODECOV_TOKEN) --required -n "$(agent.os)-python3" --build "$(Build.DefinitionName)" --env OS=$(agent.os) python=3'
     displayName: upload codecov
+    condition: and(succeeded(), variables['CODECOV_TOKEN'])
 
 - job: publish
   dependsOn:

tox.ini

@@ -70,6 +70,7 @@ commands = coverage erase
            coverage combine
            coverage report -m
            coverage xml -o {toxworkdir}/coverage.xml
+           coverage html -d {toxworkdir}/htmlcov
            diff-cover --compare-branch {env:DIFF_AGAINST:origin/master} {toxworkdir}/coverage.xml
 
 [testenv:codecov]