Changeset 995

Timestamp:

07/09/20 16:35:19 (4 years ago)

Author:

Maciej Komosinski

Message:

Added support for utf-8 in tests

Location:

tester

Files:

• comparison.py (modified) (1 diff)
• tester.py (modified) (5 diffs)

tester/comparison.py

@@ -24 +24 @@
 
                 try:
-                        fin = open(os.path.join(globals.THISDIR, name))  # first we look for the file with the specialized name (platform-dependent)...
+                        fin = open(os.path.join(globals.THISDIR, name), encoding='utf8')  # first we look for the file with the specialized name (platform-dependent)...
                 except IOError as e1:
                         try:
-                                fin = open(os.path.join(globals.THISDIR, file_name + ".goal"))  # ...if there is no such file, we try to find the default file
+                                fin = open(os.path.join(globals.THISDIR, file_name + ".goal"), encoding='utf8')  # ...if there is no such file, we try to find the default file
                         except IOError as e2:
                                 print()

tester/tester.py

@@ -89 +89 @@
         else:
                 print("\r", globals.ANSI_SETRED + " FAIL\7" + globals.ANSI_RESET)
-                print(compare.result)
+                try:
+                        print(compare.result)
+                except UnicodeEncodeError:
+                        print(compare.result.encode("utf-8")) #only encode as utf8 when it is actually used, but this looks incorrect and perhaps should not be needed if the console supports utf8?
+                        #sys.stdout.buffer.write(compare.result.encode("utf-8")) #prints nothing (on cygwin)
                 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
+                f = open(os.path.join(globals.THISDIR, failed_result_filename + '.Failed-output'), 'w',  encoding='utf8')  # files are easier to compare than stdout
                 print('\n'.join(jest)+'\n', end="", file=f) # not sure why one last empty line is always lost (or one too much is expected?), adding here...
-                f = open(os.path.join(globals.THISDIR, failed_result_filename + '.Failed-goal'), 'w')  # files are easier to compare than stdout
+                f = open(os.path.join(globals.THISDIR, failed_result_filename + '.Failed-goal'), 'w',  encoding='utf8')  # files are easier to compare than stdout
                 print('\n'.join(goal), end="", file=f)
         return compare.equal
@@ -173 +177 @@
 
 
-def print_exception():
+def print_exception(exc):
         print("\n"+("-"*60),'begin exception')
+        print(exc) # some exceptions have an empty traceback, they only provide one-line exception name
         traceback.print_exc()
         print("-"*60,'end exception')
@@ -223 +228 @@
         globals.init_colors(args)
 
-        fin = open(os.path.join(globals.THISDIR, args.file))
+        fin = open(os.path.join(globals.THISDIR, args.file), encoding='utf8')
         reset_values()
         exe_prog = "default"  # no longer in reset_values (exe: persists across tests)
@@ -264 +269 @@
                                 try:
                                         contents = []
-                                        with open(os.path.join(globals.FILESDIR, line[1]), 'r') as main_test_filename:
+                                        with open(os.path.join(globals.FILESDIR, line[1]), 'r', encoding='utf8') as main_test_filename:
                                                 for line in main_test_filename:
                                                         contents.append(globals.stripEOL(line))
                                         ok = compare(contents, outfile, '_file') # +line[1]
                                 except Exception as e: # could also 'raise' for some types of exceptions if we wanted
-                                        print_exception()
+                                        print_exception(e)
                                         ok = 0
                                 tests_failed += int(not ok)
@@ -279 +284 @@
                                         ok = test(args, test_name, input_text, output_net, output_msg, exe_prog, exeargs)
                                 except Exception as e: # could also 'raise' for some types of exceptions if we wanted
-                                        print_exception()
+                                        print_exception(e)
                                         ok = 0
                                 tests_failed += int(not ok)