Merge fc6039c into 1af8775

feerrenrut · web-flow · commit 9f5febe045e4 · 2019-08-02T14:25:01.000Z
diff --git a/appveyor.yml b/appveyor.yml
@@ -196,8 +196,15 @@ test_script:
 
 on_finish:
  - ps: |
-      Get-ChildItem output\*   | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
-      Get-ChildItem output\*\* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+    $uploadFromFolder = "output\"
+    if( Test-Path $uploadFromFolder ){
+      $root = Resolve-Path .\
+      $output = Resolve-Path $uploadFromFolder
+      $paths = [IO.Directory]::GetFiles($root.Path, '*.*', 'AllDirectories')
+      $paths | % {
+        Push-AppveyorArtifact $_ -FileName $_.Substring($root.Path.Length + 1)
+      }
+    }
 
 deploy_script:
  - ps: |
diff --git a/tests/lint/createJunitReport.py b/tests/lint/createJunitReport.py
@@ -30,7 +30,7 @@
 
 
 def makeJunitXML(inFileName, outFileName):
-	with open(inFileName, 'rt', encoding='UTF-8') as flake8In:
+	with open(inFileName, 'rt', encoding='ANSI', errors='replace') as flake8In:
 		errorText = flake8In.read()
 	if len(errorText) > 0:
 		# make "with error" xml content
@@ -39,7 +39,7 @@ def makeJunitXML(inFileName, outFileName):
 		# make "no error" xml content
 		outContents = NO_ERROR
 
-	with open(outFileName, 'wt', encoding='UTF-8') as out:
+	with open(outFileName, 'wt', encoding='UTF-8', errors='replace') as out:
 		out.write(outContents)
 
 
