Refactor PDFium python test utilities.

testing/tools/run_pixel_tests.py

 #!/usr/bin/env python
 # Copyright 2015 The PDFium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import optparse
 import os
 import re
 import subprocess
 import sys
 
 # Nomenclature:
 #   x_root - "x"
 #   x_filename - "x.ext"
 #   x_path - "path/to/a/b/c/x.ext"
 #   c_dir - "path/to/a/b/c"
 
-def extract_suppressions(filename):
-  with open(filename) as f:
-    suppressions = [y for y in [
-      x.split('#')[0].strip() for x in f.readlines()] if y]
-  return suppressions
-
 def generate_and_test(input_filename, source_dir, working_dir,
-                      fixup_path, pdfium_test_path, pdfium_diff_path):
+                      fixup_path, pdfium_test_path, image_differ):
   input_root, _ = os.path.splitext(input_filename)
   input_path = os.path.join(source_dir, input_root + '.in')
   pdf_path = os.path.join(working_dir, input_root + '.pdf')
-  actual_path_template = os.path.join(working_dir, input_root + '.pdf.%d.png')
-  expected_path_template = os.path.join(source_dir,
-                                        input_root + '_expected.pdf.%d.png')
   try:
     sys.stdout.flush()
     subprocess.check_call(
         [sys.executable, fixup_path, '--output-dir=' + working_dir, input_path])
     subprocess.check_call([pdfium_test_path, '--png', pdf_path])
-    i = 0;
-    while True:
-      expected_path = expected_path_template % i;
-      actual_path = actual_path_template % i;
-      if not os.path.exists(expected_path):
-        if i == 0:
-          print "WARNING: no expected results files found for " + input_filename
-        break
-      print "Checking " + actual_path
-      sys.stdout.flush()
-      subprocess.check_call([pdfium_diff_path, expected_path, actual_path])
-      i += 1
   except subprocess.CalledProcessError as e:
     print "FAILURE: " + input_filename + "; " + str(e)
     return False
+  if image_differ.HasDifferences(input_filename, source_dir, working_dir):
+    print "FAILURE: " + input_filename
+    return False
   return True
 
 def main():
   if sys.platform.startswith('linux'):
     os_name = 'linux'
   elif sys.platform.startswith('win'):
     os_name = 'win'
   elif sys.platform.startswith('darwin'):
     os_name = 'mac'
   else:
@@ skipping 41 matching lines @@
     pdfium_test_path = pdfium_test_path + '.exe'
     pdfium_diff_path = pdfium_diff_path + '.exe'
   # TODO(tsepez): Mac may require special handling here.
 
   # Place generated files under the build directory, not source directory.
   gen_dir = os.path.join(build_dir, 'gen', 'pdfium')
   working_dir = os.path.join(gen_dir, 'testing', 'pixel')
   if not os.path.exists(working_dir):
     os.makedirs(working_dir)
 
-  suppression_list = extract_suppressions(
-    os.path.join(testing_dir, 'SUPPRESSIONS'))
+  from suppressor import Suppressor
+  test_suppressor = Suppressor(os_name, testing_dir)
 
-  platform_suppression_filename = 'SUPPRESSIONS_%s' % os_name
-  platform_suppression_list = extract_suppressions(
-    os.path.join(testing_dir, platform_suppression_filename))
-
+  from pngdiffer import PNGDiffer
+  image_differ = PNGDiffer(os_name, pdfium_diff_path)
   failures = []
   input_file_re = re.compile('^[a-zA-Z0-9_.]+[.]in$')
   for input_filename in os.listdir(source_dir):
     if input_file_re.match(input_filename):
       input_path = os.path.join(source_dir, input_filename)
       if os.path.isfile(input_path):
-        if input_filename in suppression_list:
-          print "Not running %s, found in SUPPRESSIONS file" % input_filename
-          continue
-        if input_filename in platform_suppression_list:
-          print ("Not running %s, found in %s file" %
-                 (input_filename, platform_suppression_filename))
+        if test_suppressor.IsSuppressed(input_filename):
           continue
         if not generate_and_test(input_filename, source_dir, working_dir,
-                                 fixup_path, pdfium_test_path, pdfium_diff_path):
+                                 fixup_path, pdfium_test_path, image_differ):
           failures.append(input_path)
 
   if failures:
     print '\n\nSummary of Failures:'
     for failure in failures:
       print failure
     return 1
   return 0
 
 if __name__ == '__main__':
   sys.exit(main())