Add PRESUBMIT checks for not required testharness expected files.

Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py

 # Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 19 matching lines @@
 import logging
 import re
 import time
 
 from webkitpy.layout_tests.controllers import repaint_overlay
 from webkitpy.layout_tests.controllers import test_result_writer
 from webkitpy.layout_tests.port.driver import DeviceFailure, DriverInput, DriverOutput
 from webkitpy.layout_tests.models import test_expectations
 from webkitpy.layout_tests.models import test_failures
 from webkitpy.layout_tests.models.test_results import TestResult
+from webkitpy.layout_tests.models import testharness_results
 
 
 _log = logging.getLogger(__name__)
 
 
 def run_single_test(port, options, results_directory, worker_name, driver, test_input, stop_when_done):
     runner = SingleTestRunner(port, options, results_directory, worker_name, driver, test_input, stop_when_done)
     try:
         return runner.run()
     except DeviceFailure as e:
@@ skipping 216 matching lines @@
         return TestResult(self._test_name, failures, driver_output.test_time, driver_output.has_stderr(),
                           pid=driver_output.pid, has_repaint_overlay=has_repaint_overlay)
 
     def _compare_testharness_test(self, driver_output, expected_driver_output):
         if expected_driver_output.image or expected_driver_output.audio or expected_driver_output.text:
             return False, []
 
         if driver_output.image or driver_output.audio or self._is_render_tree(driver_output.text):
             return False, []
 
-        failures = []
-        found_a_pass = False
         text = driver_output.text or ''
-        lines = text.strip().splitlines()
-        lines = [line.strip() for line in lines]
-        header = 'This is a testharness.js-based test.'
-        footer = 'Harness: the test ran to completion.'
-        if not lines or not header in lines:
+
+        if not testharness_results.is_testharness_output(text):
             return False, []
-        if not footer in lines:
-            return True, [test_failures.FailureTestHarnessAssertion()]
-
-        for line in lines:
-            if line == header or line == footer or line.startswith('PASS'):
-                continue
-            # CONSOLE output can happen during tests and shouldn't break them.
-            if line.startswith('CONSOLE'):
-                continue
-
-            if line.startswith('FAIL') or line.startswith('TIMEOUT'):
-                return True, [test_failures.FailureTestHarnessAssertion()]
-
-            # Fail the test if there is any unrecognized output.
+        if not testharness_results.is_testharness_output_passing(text):
             return True, [test_failures.FailureTestHarnessAssertion()]
         return True, []
 
     def _is_render_tree(self, text):
         return text and "layer at (0,0) size 800x600" in text
 
     def _compare_text(self, expected_text, actual_text):
         failures = []
         if (expected_text and actual_text and
             # Assuming expected_text is already normalized.
@@ skipping 119 matching lines @@
         elif reference_driver_output.image_hash != actual_driver_output.image_hash:
             diff, err_str = self._port.diff_image(reference_driver_output.image, actual_driver_output.image)
             if diff:
                 failures.append(test_failures.FailureReftestMismatch(reference_filename))
             elif err_str:
                 _log.error(err_str)
             else:
                 _log.warning("  %s -> ref test hashes didn't match but diff passed" % self._test_name)
 
         return TestResult(self._test_name, failures, total_test_time, has_stderr, pid=actual_driver_output.pid)