vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Use python's difflib instead of calling the diff cmd. Fixes issue where diff isn't always available on Windows. Fixed #960

master
Marius Kintel 2014-09-23 12:36:27 -04:00
parent 4eb53d3355
commit f98d565714
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test_cmdline_tool.py
View File

@ -25,6 +25,7 @@ import getopt
import shutil
import platform
import string
import difflib
#_debug_tcct = True
_debug_tcct = False
@ -99,12 +100,15 @@ def compare_text(expected, actual):
return get_normalized_text(expected) == get_normalized_text(actual)
def compare_default(resultfilename):
print >> sys.stderr, 'diff text compare: '
print >> sys.stderr, 'text comparison: '
print >> sys.stderr, ' expected textfile: ', expectedfilename
print >> sys.stderr, ' actual textfile: ', resultfilename
if not compare_text(expectedfilename, resultfilename):
expected_text = get_normalized_text(expectedfilename)
actual_text = get_normalized_text(resultfilename)
if not expected_text == actual_text:
if resultfilename:
execute_and_redirect("diff", ["-u", expectedfilename, resultfilename], sys.stderr)
differences = difflib.unified_diff(expected_text.splitlines(1), actual_text.splitlines(1))
for line in differences: sys.stderr.write(line)
return False
return True