Improve run-webkit-tests error reporting when ref tests have missing images.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.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 52 matching lines @@
             writer.write_image_files(driver_output.image, expected_driver_output.image)
             writer.write_image_diff_files(driver_output.image_diff)
         elif isinstance(failure, (test_failures.FailureAudioMismatch,
                                   test_failures.FailureMissingAudio)):
             writer.write_audio_files(driver_output.audio, expected_driver_output.audio)
         elif isinstance(failure, test_failures.FailureCrash):
             crashed_driver_output = expected_driver_output if failure.is_reftest else driver_output
             writer.write_crash_log(crashed_driver_output.crash_log)
         elif isinstance(failure, test_failures.FailureLeak):
             writer.write_leak_log(driver_output.leak_log)
-        elif isinstance(failure, test_failures.FailureReftestMismatch):
+        elif isinstance(failure, (
+                test_failures.FailureReftestMismatch,
+                test_failures.FailureReftestNoImageGenerated,
+                test_failures.FailureReftestNoReferenceImageGenerated)):
             writer.write_image_files(driver_output.image, expected_driver_output.image)
-            # FIXME: This work should be done earlier in the pipeline (e.g., when we compare images for non-ref tests).
-            # FIXME: We should always have 2 images here.
             if driver_output.image and expected_driver_output.image:
                 diff_image, _ = port.diff_image(expected_driver_output.image, driver_output.image)
                 if diff_image:
                     writer.write_image_diff_files(diff_image)
                 else:
                     _log.warning('ref test mismatch did not produce an image diff.')
-            writer.write_image_files(driver_output.image, expected_image=None)
             if filesystem.exists(failure.reference_filename):
                 writer.write_reftest(failure.reference_filename)
             else:
                 _log.warning("reference %s was not found", failure.reference_filename)
         elif isinstance(failure, test_failures.FailureReftestMismatchDidNotOccur):
             writer.write_image_files(driver_output.image, expected_image=None)
             if filesystem.exists(failure.reference_filename):
                 writer.write_reftest(failure.reference_filename)
             else:
                 _log.warning("reference %s was not found", failure.reference_filename)
         else:
-            assert isinstance(failure, (test_failures.FailureTimeout, test_failures.FailureReftestNoImagesGenerated))
+            assert isinstance(failure, test_failures.FailureTimeout)
 
         if expected_driver_output is not None:
             writer.create_repaint_overlay_result(driver_output.text, expected_driver_output.text)
 
 
 def baseline_name(filesystem, test_name, suffix):
     base = filesystem.splitext(test_name)[0]
     return '%s%s.%s' % (base, TestResultWriter.FILENAME_SUFFIX_EXPECTED, suffix)
 
 
@@ skipping 177 matching lines @@
             'diff_filename': self._output_testname(self.FILENAME_SUFFIX_IMAGE_DIFF),
             'prefix': self._output_testname(''),
         }
         self._write_file(diffs_html_filename, html)
 
     def write_reftest(self, src_filepath):
         fs = self._filesystem
         dst_dir = fs.dirname(fs.join(self._root_output_dir, self._test_name))
         dst_filepath = fs.join(dst_dir, fs.basename(src_filepath))
         self._write_file(dst_filepath, fs.read_binary_file(src_filepath))