Cleanup

Author: RReverser

test/test_other.py

@@ -11899,49 +11899,41 @@ def check_output_sizes(self, *outputs: str, **metadata):
 
     obtained_results = {}
 
+    def update_and_print_diff(key, actual, expected):
+      obtained_results[key] = actual
+      diff = actual - expected
+      s = f'{key}: size={actual}, expected={expected}'
+      if diff:
+        s += f', delta={diff} ({diff * 100.0 / expected:+.2f}%)'
+      print(s)
+      return diff
+
     total_output_size = 0
     total_expected_size = 0
     total_output_size_gz = 0
     total_expected_size_gz = 0
+
     for f in outputs:
-      f_gz = f + '.gz'
-      expected_size = expected_results.get(f, inf)
-      expected_size_gz = expected_results.get(f_gz, inf)
       contents = read_binary(f)
-      size = len(contents)
-      size_gz = len(gzip.compress(contents))
 
-      obtained_results[f] = size
-      obtained_results[f_gz] = size_gz
-
-      if not common.EMTEST_REBASELINE and size != expected_size and (f.endswith(('.js', '.html'))):
-        print('Contents of ' + f + ': ')
+      size = len(contents)
+      expected_size = expected_results.get(f, inf)
+      if update_and_print_diff(f, size, expected_size) and common.EMTEST_VERBOSE and not common.EMTEST_REBASELINE and f.endswith(('.js', '.html')):
+        print(f'Contents of {f}:')
         print(contents.decode('utf-8', errors='replace'))
-
-      def print_diff(title, actual, expected):
-        diff = actual - expected
-        s = f'{title}={actual}, expected {expected}'
-        if diff > 0:
-          s += f', delta={diff} ({diff * 100.0 / expected:+.2f}%)'
-        print(s)
-
-      print_diff(f'size of {f}', size, expected_size)
-      print_diff(f'size of {f_gz}', size_gz, expected_size_gz)
-
-      # N.B. even though the test code above prints out gzip compressed sizes, regression testing is done against uncompressed sizes
-      # this is because optimizing for compressed sizes can be unpredictable and sometimes counterproductive
       total_output_size += size
       total_expected_size += expected_size
 
+      f_gz = f + '.gz'
+      size_gz = len(gzip.compress(contents))
+      expected_size_gz = expected_results.get(f_gz, inf)
+      update_and_print_diff(f_gz, size_gz, expected_size_gz)
       total_output_size_gz += size_gz
       total_expected_size_gz += expected_size_gz
 
     if len(outputs) > 1:
-      obtained_results['total'] = total_output_size
-      obtained_results['total_gz'] = total_output_size_gz
-
-    print_diff('Total output size', total_output_size, total_expected_size)
-    print_diff('Total output size gzipped', total_output_size_gz, total_expected_size_gz)
+      update_and_print_diff('total', total_output_size, total_expected_size)
+      update_and_print_diff('total_gz', total_output_size_gz, total_expected_size_gz)
 
     obtained_results.update(metadata)