test: fix test runner for Python 3 on Windows

targos · targos · commit 2ebd1a0d3f22 · 2019-11-11T10:24:48.000+01:00
Explicitly open files with utf8 encoding, otherwise the system could use another encoding such as latin1 by default. PR-URL: #30023 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Christian Clauss <cclauss@me.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/test/testpy/__init__.py b/test/testpy/__init__.py
@@ -29,6 +29,7 @@
 import os
 import re
 from functools import reduce
+from io import open
 
 
 FLAGS_PATTERN = re.compile(r"//\s+Flags:(.*)")
@@ -56,7 +57,7 @@ def GetName(self):
 
 def GetCommand(self):
 result = [self.config.context.GetVm(self.arch, self.mode)]
- source = open(self.file).read()
+ source = open(self.file, encoding='utf8').read()
 flags_match = FLAGS_PATTERN.search(source)
 if flags_match:
 flags = flags_match.group(1).strip().split()
diff --git a/tools/test.py b/tools/test.py
@@ -45,6 +45,7 @@
 import errno
 import copy
 
+from io import open
 from os.path import join, dirname, abspath, basename, isdir, exists
 from datetime import datetime
 try:
@@ -728,8 +729,8 @@ def disableCoreFiles():
 )
 os.close(fd_out)
 os.close(fd_err)
- output = open(outname).read()
- errors = open(errname).read()
+ output = open(outname, encoding='utf8').read()
+ errors = open(errname, encoding='utf8').read()
 CheckedUnlink(outname)
 CheckedUnlink(errname)
 

-Original file line number
+Diff line change
 importos
 importre
 fromfunctoolsimportreduce
 +fromioimportopen
 FLAGS_PATTERN=re.compile(r"//\s+Flags:(.*)")
 defGetCommand(self):
 result= [self.config.context.GetVm(self.arch, self.mode)]
 -source=open(self.file).read()
 +source=open(self.file, encoding='utf8').read()
 flags_match=FLAGS_PATTERN.search(source)
 ifflags_match:
 flags=flags_match.group(1).strip().split()
-Original file line number
+Diff line change
 importerrno
 importcopy
 +fromioimportopen
 fromos.pathimportjoin, dirname, abspath, basename, isdir, exists
 fromdatetimeimportdatetime
 try:
+ )
 os.close(fd_out)
 os.close(fd_err)
 -output=open(outname).read()
 -errors=open(errname).read()
 +output=open(outname, encoding='utf8').read()
 +errors=open(errname, encoding='utf8').read()
 CheckedUnlink(outname)
 CheckedUnlink(errname)