Switch to using WebKit's test expecation parser.

media/tools/layout_tests/layouttest_analyzer_helpers.py

 # Copyright (c) 2012 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.
 
 """Helper functions for the layout test analyzer."""
 
 from datetime import datetime
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 import fileinput
@@ skipping 35 matching lines @@
     classify them as 'whole', 'skip' or 'nonskip' based on that information.
 
     Args:
       test_info_map: the result map of |layouttests.JoinWithTestExpectation|.
           The key of the map is test name such as 'media/media-foo.html'.
           The value of the map is a map that contains the following keys:
           'desc'(description), 'te_info' (test expectation information),
           which is a list of test expectation information map. The key of the
           test expectation information map is test expectation keywords such
           as "SKIP" and other keywords (for full list of keywords, please
           refer to |test_expectaions.ALL_TE_KEYWORDS|).

[Ami GONE FROM CHROMIUM, 2012/09/25 00:40:30]

test_expectaions typo

[DaleCurtis, 2012/09/25 01:14:50]

Done.

     """
     self.result_map = {}
     self.result_map['whole'] = {}
     self.result_map['skip'] = {}
     self.result_map['nonskip'] = {}
     if test_info_map:
       for (k, value) in test_info_map.iteritems():
         self.result_map['whole'][k] = value
         if 'te_info' in value:
-          # Don't count SLOW PASS or WONTFIX tests as failures.
+          # Don't count SLOW PASS, WONTFIX, or ANDROID tests as failures.
           if any([True for x in value['te_info'] if set(x.keys()) ==

[Ami GONE FROM CHROMIUM, 2012/09/25 00:40:30]

I'm confused by the == (I'd expect a "containedIn" or somesuch).

[DaleCurtis, 2012/09/25 01:14:50]

Doing a subset would match SLOW PASS IMAGE.

-                 set(['SLOW', 'PASS', 'Bugs', 'Comments']) or 'WONTFIX' in x]):
-            continue
-          # Ignore failures on the ANDROID platform.
-          if value['te_info']['Platforms'] == ['ANDROID']:
+                 set(['SLOW', 'PASS', 'Bugs', 'Comments', 'Platforms']) or

[Ami GONE FROM CHROMIUM, 2012/09/25 00:40:30]

indent is off?

[DaleCurtis, 2012/09/25 01:14:50]

Done.

+                 'WONTFIX' in x or x['Platforms'] == ['ANDROID']]):
             continue
           if any([True for x in value['te_info'] if 'SKIP' in x]):
             self.result_map['skip'][k] = value
           else:
             self.result_map['nonskip'][k] = value
 
   @staticmethod
   def GetDiffString(diff_map_element, type_str):
     """Get difference string out of diff map element.
 
@@ skipping 515 matching lines @@
           list2 = map2[name]['te_info']
           te_diff = [item for item in list1 if not item in list2]
           if te_diff:
             name_list.append((name, te_diff))
       else:
         name_list.append((name, value1))
     return name_list
 
   return (GetDiffBetweenMapsHelper(map1, map2, lookIntoTestExpectationInfo),
           GetDiffBetweenMapsHelper(map2, map1, lookIntoTestExpectationInfo))