Skip to content

Commit

Permalink
Fix Python test scripts for Python 3 and Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
datadiode authored and cdunn2001 committed Jan 16, 2015
1 parent 59a0165 commit 01aee4a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions test/runjsontests.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def safeGetLine( lines, index ):

def safeReadFile( path ):
try:
return file( path, 'rt' ).read()
return open( path, 'rt', encoding = 'utf-8' ).read()
except IOError as e:
return '<File "%s" is missing: %s>' % (path,e)

Expand Down Expand Up @@ -77,13 +77,13 @@ def runAllTests( jsontest_executable_path, input_dir = None,
base_path = os.path.splitext(input_path)[0]
actual_output = safeReadFile( base_path + '.actual' )
actual_rewrite_output = safeReadFile( base_path + '.actual-rewrite' )
file(base_path + '.process-output','wt').write( process_output )
open(base_path + '.process-output', 'wt', encoding = 'utf-8').write( process_output )
if status:
print('parsing failed')
failed_tests.append( (input_path, 'Parsing failed:\n' + process_output) )
else:
expected_output_path = os.path.splitext(input_path)[0] + '.expected'
expected_output = file( expected_output_path, 'rt' ).read()
expected_output = open( expected_output_path, 'rt', encoding = 'utf-8' ).read()
detail = ( compareOutputs( expected_output, actual_output, 'input' )
or compareOutputs( expected_output, actual_rewrite_output, 'rewrite' ) )
if detail:
Expand Down
2 changes: 1 addition & 1 deletion test/rununittests.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def runAllTests( exe_path, use_valgrind=False ):
if not status:
print("Failed to obtain unit tests list:\n" + test_names, file=sys.stderr)
return 1
test_names = [name.strip() for name in test_names.strip().split('\n')]
test_names = [name.strip() for name in test_names.decode('utf-8').strip().split('\n')]
failures = []
for name in test_names:
print('TESTING %s:' % name, end=' ')
Expand Down

0 comments on commit 01aee4a

Please sign in to comment.