Refactor the way that TestApi works so that it is actually useful.

scripts/slave/recipe_modules/json/api.py

 # Copyright 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 functools
 import json
 import os
 import tempfile
 
 from cStringIO import StringIO
 
 from slave import recipe_api
 
+from .util import TestResults
+
 class StringListIO(object):
   def __init__(self):
     self.lines = [StringIO()]
 
   def write(self, s):
     while s:
       i = s.find('\n')
       if i == -1:
         self.lines[-1].write(s)
         break
       self.lines[-1].write(s[:i])
       self.lines[-1] = self.lines[-1].getvalue()
       self.lines.append(StringIO())
       s = s[i+1:]
 
   def close(self):
     if not isinstance(self.lines[-1], basestring):
       self.lines[-1] = self.lines[-1].getvalue()
 
 
-def convert_trie_to_flat_paths(trie, prefix=None):
-  # Cloned from webkitpy.layout_tests.layout_package.json_results_generator
-  # so that this code can stand alone.
-  result = {}
-  for name, data in trie.iteritems():
-    if prefix:
-      name = prefix + "/" + name
-
-    if len(data) and not "actual" in data and not "expected" in data:
-      result.update(convert_trie_to_flat_paths(data, name))
-    else:
-      result[name] = data
-
-  return result
-
-
-class TestResults(object):
-  def __init__(self, jsonish):
-    self.raw = jsonish
-
-    self.tests = convert_trie_to_flat_paths(jsonish.get('tests', {}))
-    self.passes = {}
-    self.unexpected_passes = {}
-    self.failures = {}
-    self.unexpected_failures = {}
-    self.flakes = {}
-    self.unexpected_flakes = {}
-
-    for (test, result) in self.tests.iteritems():
-      key = 'unexpected_' if result.get('is_unexpected') else ''
-      actual_result = result['actual']
-      data = actual_result
-      if ' PASS' in actual_result:
-        key += 'flakes'
-      elif actual_result == 'PASS':
-        key += 'passes'
-        data = result
-      else:
-        key += 'failures'
-      getattr(self, key)[test] = data
-
-  def __getattr__(self, key):
-    if key in self.raw:
-      return self.raw[key]
-    raise AttributeError("'%s' object has no attribute '%s'" %
-                         (self.__class__, key))  # pragma: no cover
-
-
 class JsonOutputPlaceholder(recipe_api.Placeholder):
   """JsonOutputPlaceholder is meant to be a placeholder object which, when added
   to a step's cmd list, will be replaced by annotated_run with the command
   parameters --output-json /path/to/file during the evaluation of your recipe
   generator.
 
   This placeholder can be optionally added when you use the Steps.step()
   method in this module.
 
   After the termination of the step, this file is expected to contain a valid
@@ skipping 89 matching lines @@
 
     It's vastly preferable to have your recipe only pass the bare minimum
     of arguments to steps. Passing property objects obscures the data that
     the script actually consumes from the property object.
     """
     prop_str = self.dumps(dict(self.m.properties))
     return [
       '--factory-properties', prop_str,
       '--build-properties', prop_str
     ]
-