Merge pull request #39 from xoviat/sonarqube

Tests: FIXUP sonarqube.

Author: xoviat

appveyor.yml

@@ -85,6 +85,7 @@ install:
   - "%CMD_IN_ENV% python tests/scripts/appveyor/fetch_wrapper.py"
 
   - "%CMD_IN_ENV% build-wrapper-win-x86-64 --out-dir sonar python setup.py bdist_wheel"
+  - "%CMD_IN_ENV% python tests/scripts/appveyor/fixup_wrapper.py sonar/build-wrapper-dump.json"
   - "%CMD_IN_ENV% python tests/scripts/install_wheels.py dist"
 
 build: none
@@ -119,8 +120,8 @@ on_finish:
         "https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)",
         (Resolve-Path .\junit-results.xml)
       )
-    
-  - "%CMD_IN_ENV% python tests/scripts/appveyor/fixup_wrapper.py sonar/build-wrapper-dump.json"
+      $LastExitCode = 0
+
   - ps: |
       if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER) {
         sonar-scanner `
@@ -130,3 +131,4 @@ on_finish:
           "-Dsonar.login=%SONAR_TOKEN%" `
           "-Dsonar.cfamily.build-wrapper-output=sonar"
       }
+      $LastExitCode = 0

tests/scripts/appveyor/fixup_wrapper.py

@@ -12,8 +12,10 @@
 
 wrapper = json.loads(wrapper_file.read())
 
-for i in range(len(wrapper['captures'])):
+for i, item in enumerate(wrapper['captures']):
     wrapper['captures'][i]['stdout'] = wrapper['captures'][0]['stdout']
     wrapper['captures'][i]['stderr'] = wrapper['captures'][0]['stderr']
 
+wrapper_file.seek(0)
+wrapper_file.truncate()
 wrapper_file.write(json.dumps(wrapper))