AriasCreations/LSL-PyOptimizer
3
0
Fork 0
mirror of https://github.com/Sei-Lisa/LSL-PyOptimizer synced 2025-07-01 23:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some discrepancies between main and run-tests

Browse source 
These discrepancies were in how line endings are interpreted, and were causing issues under Windows.

Also simplify CRLF handling.
This commit is contained in:
Sei Lisa 2022-12-11 18:20:18 +01:00
parent cc55c4c23e
commit 79a57e6532
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
run-tests.py
View file

@ -186,7 +186,7 @@ def parseArgs(s):
# args[i] = argout # args[i] = argout
# return args # return args
def tryRead(fn, Binary = True): def tryRead(fn, Binary = False):
result = None result = None
try: try:
f = open(fn, 'rb' if Binary else 'r') f = open(fn, 'rb' if Binary else 'r')
@ -326,8 +326,8 @@ class UnitTestRegression(UnitTestCase):
sys.stderr = save_stderr sys.stderr = save_stderr
self.assertLessEqual(errs, 138) self.assertLessEqual(errs, 138)
expected_stdout = tryRead('unit_tests/json.out') expected_stdout = str2b(tryRead('unit_tests/json.out'), 'utf8')
expected_stderr = tryRead('unit_tests/json.err') expected_stderr = str2b(tryRead('unit_tests/json.err'), 'utf8')
try: try:
self.assertTrue(actual_stdout == expected_stdout) self.assertTrue(actual_stdout == expected_stdout)
except AssertionError: except AssertionError:
@ -735,10 +735,17 @@ def generateScriptTests():
# Create a closure with the test data # Create a closure with the test data
def makeTestFunction(fbase, suite): def makeTestFunction(fbase, suite):
def TestFunction(self): def TestFunction(self):
stdin = tryRead(fbase + '.lsl') or b'' # We NEED to read in binary, because there's invalid UTF-8
expected_stdout = tryRead(fbase + '.out') or b'' # as part of the tests, and Python 3 would choke otherwise.
expected_stderr = tryRead(fbase + '.err') or b'' # This means we have to deal with CRLF line endings here.
runargs = (parseArgs(tryRead(fbase + '.run', Binary=False)) stdin = (tryRead(fbase + '.lsl', Binary=True) or b''
).replace(b'\r\n', b'\n')
expected_stdout = str2b(tryRead(fbase + '.out') or '',
'utf8')
expected_stderr = str2b(tryRead(fbase + '.err') or '',
'utf8')
runargs = (parseArgs(tryRead(fbase + '.run'))
or (['main.py', '-y', '-'] if suite != 'Expr' or (['main.py', '-y', '-'] if suite != 'Expr'
else ['main.py', else ['main.py',
# Defaults for Expr: # Defaults for Expr:
@ -748,13 +755,8 @@ def generateScriptTests():
'-'])) '-']))
werr(u"\nRunning test %s: " % any2u(fbase)) werr(u"\nRunning test %s: " % any2u(fbase))
actual_stdout, actual_stderr = invokeMain(runargs, stdin) actual_stdout, actual_stderr = invokeMain(runargs, stdin)
actual_stdout = (actual_stdout.replace(b'\r',b'\r\n') actual_stdout = actual_stdout.replace(b'\r\n', b'\n')
.replace(b'\r\n\n',b'\n') actual_stderr = actual_stderr.replace(b'\r\n', b'\n')
.replace(b'\r\n',b'\n'))
actual_stderr = (actual_stderr.replace(b'\r',b'\r\n')
.replace(b'\r\n\n',b'\n')
.replace(b'\r\n',b'\n'))
try: try:
if expected_stderr.startswith(b'REGEX\n'): if expected_stderr.startswith(b'REGEX\n'):