Prepare python code for reftests.

sky/tools/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 53 matching lines @@
         self._timeout = test_input.timeout
         self._worker_name = worker_name
         self._test_name = test_input.test_name
         self._should_run_pixel_test = test_input.should_run_pixel_test
         self._reference_files = test_input.reference_files
         self._should_add_missing_baselines = test_input.should_add_missing_baselines
         self._stop_when_done = stop_when_done
 
         if self._reference_files:
             # Detect and report a test which has a wrong combination of expectation files.
-            # For example, if 'foo.html' has two expectation files, 'foo-expected.html' and
+            # For example, if 'foo.html' has two expectation files, 'foo-expected.sky' and
             # 'foo-expected.txt', we should warn users. One test file must be used exclusively
             # in either layout tests or reftests, but not in both.
             for suffix in ('.txt', '.png', '.wav'):
                 expected_filename = self._port.expected_filename(self._test_name, suffix)
                 if self._filesystem.exists(expected_filename):
                     _log.error('%s is a reftest, but has an unused expectation file. Please remove %s.',
                         self._test_name, expected_filename)
 
     def _expected_driver_output(self):
         return DriverOutput(self._port.expected_text(self._test_name),
@@ skipping 310 matching lines @@
         if failures:
             # Don't continue any more if we already have crash or timeout.
             return TestResult(self._test_name, failures, total_test_time, has_stderr)
         failures.extend(self._handle_error(reference_driver_output, reference_filename=reference_filename))
         if failures:
             return TestResult(self._test_name, failures, total_test_time, has_stderr, pid=actual_driver_output.pid)
 
         if not reference_driver_output.image_hash and not actual_driver_output.image_hash:
             failures.append(test_failures.FailureReftestNoImagesGenerated(reference_filename))
         elif mismatch:
-            if 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 not diff:
-                    failures.append(test_failures.FailureReftestMismatchDidNotOccur(reference_filename))
-                elif err_str:
-                    _log.error(err_str)
-                else:
-                    _log.warning("  %s -> ref test hashes matched but diff failed" % self._test_name)
+            diff, err_str = self._port.diff_image(reference_driver_output.image, actual_driver_output.image)
+            if not diff:
+                failures.append(test_failures.FailureReftestMismatchDidNotOccur(reference_filename))
+            elif err_str:
+                _log.error(err_str)
 
-        elif reference_driver_output.image_hash != actual_driver_output.image_hash:
+        else:
             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)