Reland r159735 - support for test harness (text-only) tests w/o expected results.

Tools/Scripts/webkitpy/layout_tests/models/test_failures.py

 # Copyright (C) 2010 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 43 matching lines @@
     elif FailureTimeout in failure_types:
         return test_expectations.TIMEOUT
     elif FailureEarlyExit in failure_types:
         return test_expectations.SKIP
     elif (FailureMissingResult in failure_types or
           FailureMissingImage in failure_types or
           FailureMissingImageHash in failure_types or
           FailureMissingAudio in failure_types):
         return test_expectations.MISSING
     else:
-        is_text_failure = FailureTextMismatch in failure_types
+        is_text_failure = (FailureTextMismatch in failure_types or
+                           FailureTestHarnessAssertion in failure_types)
         is_image_failure = (FailureImageHashIncorrect in failure_types or
                             FailureImageHashMismatch in failure_types)
         is_audio_failure = (FailureAudioMismatch in failure_types)
         if is_text_failure and is_image_failure:
             return test_expectations.IMAGE_PLUS_TEXT
         elif is_text_failure:
             return test_expectations.TEXT
         elif is_image_failure or is_reftest_failure(failure_list):
             return test_expectations.IMAGE
         elif is_audio_failure:
@@ skipping 59 matching lines @@
 
     def driver_needs_restart(self):
         return True
 
 
 class FailureMissingResult(TestFailure):
     def message(self):
         return "-expected.txt was missing"
 
 
+class FailureTestHarnessAssertion(TestFailure):
+    def message(self):
+        return "asserts failed"
+
+
 class FailureTextMismatch(TestFailure):
     def message(self):
         return "text diff"
 
+
 class FailureMissingImageHash(TestFailure):
     def message(self):
         return "-expected.png was missing an embedded checksum"
 
 
 class FailureMissingImage(TestFailure):
     def message(self):
         return "-expected.png was missing"
 
 
@@ skipping 45 matching lines @@
 
 
 class FailureEarlyExit(TestFailure):
     def message(self):
         return "skipped due to early exit"
 
 
 # Convenient collection of all failure classes for anything that might
 # need to enumerate over them all.
 ALL_FAILURE_CLASSES = (FailureTimeout, FailureCrash, FailureMissingResult,
+                       FailureTestHarnessAssertion,
                        FailureTextMismatch, FailureMissingImageHash,
                        FailureMissingImage, FailureImageHashMismatch,
                        FailureImageHashIncorrect, FailureReftestMismatch,
                        FailureReftestMismatchDidNotOccur, FailureReftestNoImagesGenerated,
                        FailureMissingAudio, FailureAudioMismatch,
                        FailureEarlyExit)