Changeset 987 for tester/tester.py

Timestamp:

07/08/20 23:35:17 (4 years ago)

Author:

Maciej Komosinski

Message:

When tests fail, create failed result files with filenames similar to the filenames of goal files

File:

• tester/tester.py (modified) (3 diffs)

tester/tester.py

@@ -15 +15 @@
 #       if 'cyg' in a or 'cyg' in b: #...that contain 'cyg' and therefore may be useful for detecting that we are running under cygwin
 #               print(a,b)
-CYGWIN='cygwin' in os.environ['HOME']
+CYGWIN='HOME' in os.environ and 'cygwin' in os.environ['HOME']
 if CYGWIN:
         os.linesep='\n' #fix wrong value (suitable for Windows)
@@ -84 +84 @@
 
 def compare(jest, goal, was_compared_to):
-        p = comparison.Comparison(jest, goal)
-        if p.ok:
+        compare = comparison.Comparison(jest, goal)
+        if compare.equal:
                 print("\r", globals.ANSI_SETGREEN + " ok" + globals.ANSI_RESET)
         else:
                 print("\r", globals.ANSI_SETRED + " FAIL\7" + globals.ANSI_RESET)
-                print(p.result)
-                f = open(os.path.join(globals.THISDIR, '_last_failed' + was_compared_to + '.output'), 'w')  # files are easier to compare than stdout
+                print(compare.result)
+                failed_result_filename = compare.list2_file + was_compared_to
+                if failed_result_filename == '':
+                        failed_result_filename = '_test'
+                f = open(os.path.join(globals.THISDIR, failed_result_filename + '.Failed-output'), 'w')  # files are easier to compare than stdout
                 print('\n'.join(jest), end="", file=f)
-                f = open(os.path.join(globals.THISDIR, '_last_failed' + was_compared_to + '.goal'), 'w')  # files are easier to compare than stdout
+                f = open(os.path.join(globals.THISDIR, failed_result_filename + '.Failed-goal'), 'w')  # files are easier to compare than stdout
                 print('\n'.join(goal), end="", file=f)
-        return p.ok
+        return compare.equal
 
 
@@ -264 +267 @@
                                                 for line in main_test_filename:
                                                         contents.append(globals.stripEOL(line))
-                                        ok = compare(contents, outfile, '_file')
+                                        ok = compare(contents, outfile, '_file') # +line[1]
                                 except Exception as e: # could also 'raise' for some types of exceptions if we wanted
                                         print_exception()