Fix handling of tests that fail two different ways in run-webkit-tests (buildbot side)

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import glob
 import hashlib
 import json
 import multiprocessing
@@ skipping 304 matching lines @@
 
 def _ParseLayoutTestResults(results):
   """Extract the failures from the test run."""
   # Cloned from third_party/WebKit/Tools/Scripts/print-json-test-results
   tests = _ConvertTrieToFlatPaths(results['tests'])
   failures = {}
   flakes = {}
   passes = {}
   for (test, result) in tests.iteritems():
     if result.get('is_unexpected'):
-      actual_result = result['actual']
-      if ' PASS' in actual_result:
-        flakes[test] = actual_result
-      elif actual_result == 'PASS':
+      actual_results = result['actual'].split()
+      expected_results = result['expected'].split()
+      if len(actual_results) > 1:
+        # We report the first failure type back, even if the second
+        # was more severe.
+        if actual_results[1] in expected_results:
+          flakes[test] = actual_results[0]
+        else:
+          failures[test] = actual_results[0]
+      elif actual_results[0] == 'PASS':
         passes[test] = result
       else:
-        failures[test] = actual_result
+        failures[test] = actual_results[0]
 
   return (passes, failures, flakes)
 
 
 def _ConvertTrieToFlatPaths(trie, prefix=None):
   """Flatten the trie of failures into a list."""
   # Cloned from third_party/WebKit/Tools/Scripts/print-json-test-results
   result = {}
   for name, data in trie.iteritems():
     if prefix:
@@ skipping 246 matching lines @@
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))