ahamilton/eris
1
0
Fork 0
Code Releases Activity

When running golden tests use diff if meld is not available.

Browse source
This commit is contained in:
Andrew Hamilton 2017-07-23 22:49:48 +01:00
parent f583b66437
commit 32ba6fd01c
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tests/golden.py
View file

@ -18,7 +18,7 @@ def _accept_actual(failed):
print("Wrote golden file: %s" % golden_path) print("Wrote golden file: %s" % golden_path)
def _run_meld_gui(failed): def _show_differences(failed):
temp_dir = tempfile.mkdtemp() temp_dir = tempfile.mkdtemp()
try: try:
golden_dir = os.path.join(temp_dir, "golden") golden_dir = os.path.join(temp_dir, "golden")
@ -32,7 +32,8 @@ def _run_meld_gui(failed):
actual.write(actual_str) actual.write(actual_str)
os.symlink(os.path.abspath(golden_file), os.symlink(os.path.abspath(golden_file),
os.path.join(golden_dir, name)) os.path.join(golden_dir, name))
subprocess.call(["meld", actual_dir, golden_dir]) diff_command = ["meld"] if shutil.which("meld") else ["diff", "-r"]
subprocess.call(diff_command + [actual_dir, golden_dir])
finally: finally:
shutil.rmtree(temp_dir) shutil.rmtree(temp_dir)
@ -76,4 +77,4 @@ def main():
if options.should_accept_actual: if options.should_accept_actual:
_accept_actual(_FAILED) _accept_actual(_FAILED)
if options.should_diff: if options.should_diff:
_run_meld_gui(_FAILED) _show_differences(_FAILED)