3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 21:36:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support Python3 in approval tests

Browse Source
This commit is contained in:
Tom Hughes 2018-04-06 13:59:08 +01:00 committed by Martin Hořeňovský
parent f00257e374
commit dc6b83bec9
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/approvalTests.py
View File

@ -72,10 +72,17 @@ else:
overallResult = 0 overallResult = 0
def openFile(file, mode):
try:
return open(file, mode, encoding='utf-8', errors='surrogateescape')
except TypeError:
import io
return io.open(file, mode, encoding='utf-8', errors='surrogateescape')
def diffFiles(fileA, fileB): def diffFiles(fileA, fileB):
with open(fileA, 'r') as file: with openFile(fileA, 'r') as file:
aLines = [line.rstrip() for line in file.readlines()] aLines = [line.rstrip() for line in file.readlines()]
with open(fileB, 'r') as file: with openFile(fileB, 'r') as file:
bLines = [line.rstrip() for line in file.readlines()] bLines = [line.rstrip() for line in file.readlines()]
shortenedFilenameA = fileA.rsplit(os.sep, 1)[-1] shortenedFilenameA = fileA.rsplit(os.sep, 1)[-1]
@ -139,8 +146,8 @@ def approve(baseName, args):
subprocess.call(args, stdout=f, stderr=f) subprocess.call(args, stdout=f, stderr=f)
f.close() f.close()
rawFile = open(rawResultsPath, 'r') rawFile = openFile(rawResultsPath, 'r')
filteredFile = open(filteredResultsPath, 'w') filteredFile = openFile(filteredResultsPath, 'w')
for line in rawFile: for line in rawFile:
filteredFile.write(filterLine(line).rstrip() + "\n") filteredFile.write(filterLine(line).rstrip() + "\n")
filteredFile.close() filteredFile.close()