Improves some of the error handling of the layout test comparison tool. Now, if a builder isn't found, it won't spew a stack trace.

Also, fixed a problem with mis-reporting PNG diff failures.

BUG=none
TEST=Run test_output_formatter.py with a bogus builder, verify error message.

Review URL: http://codereview.chromium.org/176008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24679 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 2 deletions

diff --git a/webkit/tools/layout_tests/layout_package/failure_finder.py b/webkit/tools/layout_tests/layout_package/failure_finder.py
index 63fe573..a8ba60f 100644
--- a/webkit/tools/layout_tests/layout_package/failure_finder.py
+++ b/webkit/tools/layout_tests/layout_package/failure_finder.py
@@ -156,7 +156,7 @@ def GeneratePNGDiff(file1, file2, output_file):
         raise e
   if not result:
     print "The given PNG images were the same!"
-  return result and result != 1 and _compare_available
+  return _compare_available
 
 # TODO(gwilson): Change this to use the pretty print differs.
 def GenerateTextDiff(file1, file2, output_file):
@@ -258,6 +258,8 @@ class FailureFinder(object):
       print "Fetching failures from buildbot..."
 
     content = self._ScrapeBuilderOutput()
+    if not content:
+      return None
     matches = self._FindMatchesInBuilderOutput(content)
 
     if self.verbose:
@@ -295,7 +297,9 @@ class FailureFinder(object):
           print "Could not find builder on waterfall, trying fyi waterfall..."
         self.fyi_builder = True
         return self._ScrapeBuilderOutput()
-      print "Couldn't find that builder, or build did not compile."
+      print "I could not find that builder, or build did not compile."
+      print "Check that the builder name matches exactly (case sensitive),"
+      print "and wrap quotes around builder names that have spaces."
       return None
 
   def _FindMatchesInBuilderOutput(self, output):