Changeset 987

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

Location:

tester

Files:

• comparison.py (modified) (5 diffs)
• tester.py (modified) (3 diffs)

tester/comparison.py

@@ -7 +7 @@
 class Comparison:
         def __init__(self, l1, l2):
+                self.list2_file = '' # (last if there are many) file name with goal results (if they are stored in a file)
                 self.list1 = self.prepare_fill_in_files(l1)
                 self.list2 = self.prepare_fill_in_files(l2)
                 self.p1 = 0  # updated position within list1
                 self.p2 = 0  # updated position within list2
-                self.ok = True  # the final comparison result
+                self.equal = True  # the final comparison result
                 self.result = ""  # details of comparing individual lines
 
                 while not self.finished():
                         if not self.compare_element():
-                                self.ok = False
+                                self.equal = False
 
         @staticmethod
@@ -38 +39 @@
                                 file_name = l[len(globals.SPEC_INSERTPLATFORMDEPENDENTFILE):]
                                 new_list += self.load_platform_specific(file_name)
+                                self.list2_file = file_name
                         else:
                                 new_list.append(l)
@@ -66 +68 @@
                         waiting = False
                 if e2.startswith(globals.SPEC_REGEXP):
-                        ok = re.match(e2[len(globals.SPEC_REGEXP):], e1)
+                        equal = re.match(e2[len(globals.SPEC_REGEXP):], e1)
                 else:
-                        ok = self.compare_strings(e1, e2)  # ignoring the discrimination of /\ will work only when regexp's are not used
+                        equal = self.compare_strings(e1, e2)  # ignoring the discrimination of /\ will work only when regexp's are not used
                 self.result += repr(e1) + " "
-                if ok:
+                if equal:
                         self.p2 += 1
                 else:
@@ -77 +79 @@
                                         self.p2 += 1
                                 else:
-                                        ok = True
+                                        equal = True
                         else:
                                 self.p2 += 1
-                if ok:
+                if equal:
                         self.result += globals.ANSI_SETGREEN + "ok" + globals.ANSI_RESET + "\n"  # if both are identical, we display only the left one
                 else:
@@ -86 +88 @@
                         self.result += repr(e2disp) + "\n"
                 self.p1 += 1
-                return ok
+                return equal

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()