[Findit] Hook up analysis for CQ flakes.

appengine/findit/waterfall/flake/step_mapper.py

 # Copyright 2016 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 json
 import os
 
 import logging
 
 from common import cache_decorator
-from common.http_client_appengine import HttpClientAppEngine as HttpClient
+from common.http_client_appengine import HttpClientAppengine as HttpClient
 from waterfall import buildbot
 from waterfall import swarming_util
 
 
 @cache_decorator.Cached(
     namespace='trybots', cacher=cache_decorator.CompressedMemCacher())
 def _LoadTrybots():  # pragma: no cover.
   """Returns the mapping of Commit Queue trybots to Waterfall buildbots."""
   with open(os.path.join(os.path.dirname(__file__), 'trybots.json'), 'r') as f:
     return json.load(f)
@@ skipping 39 matching lines @@
 
   # 2. Get "name" of the CQ trybot step in the tags of a Swarming task.
   tasks = swarming_util.ListSwarmingTasksDataByTags(
       cq_build_step.master_name, cq_build_step.builder_name,
       cq_build_step.build_number, http_client,
       {'stepname': cq_build_step.step_name})
   if not tasks:
     logging.info(
         '%s/%s/%s is not Swarmed yet.',
         cq_build_step.master_name, cq_build_step.builder_name,
-        cq_build_step.build_step)
+        cq_build_step.step_name)
     return no_matching_result  # Not on Swarm yet.
 
   # Name of the step in the tags of a Swarming task.
   # Can't use step name, as cq one is with "(with patch)" while waterfall one
   # without.
   name = GetTagValue('name', tasks[0].get('tags', []))
   # The OS in which the test runs on. The same test binary might run on two
   # different OS platforms.
   os_name = GetTagValue('os', tasks[0].get('tags', []))
   if not name or not os_name:
@@ skipping 15 matching lines @@
     # 4. Check whether there is matching step.
     # TODO: we might have to check OS or dimension too.
     tasks = swarming_util.ListSwarmingTasksDataByTags(
         wf_master_name, wf_builder_name, builds[0], http_client,
         {'name': name, 'os': os_name})
     if tasks:  # One matching buildbot is found.
       wf_step_name = GetTagValue('stepname', tasks[0].get('tags', []))
       logging.info(
           '%s/%s/%s is mapped to %s/%s/%s',
           cq_build_step.master_name, cq_build_step.builder_name,
-          cq_build_step.build_step, wf_master_name, wf_builder_name,
+          cq_build_step.step_name, wf_master_name, wf_builder_name,
           wf_step_name)
       return wf_master_name, wf_builder_name, builds[0], wf_step_name
 
   return no_matching_result
 
 
 def FindMatchingWaterfallStep(build_step):  # pragma: no cover.
   """Finds the matching Waterfall step and checks whether it is supported.
 
   Only Swarmed and gtest-based steps are supported at the moment.
@@ skipping 43 matching lines @@
     output = swarming_util.RetrieveShardedTestResultsFromIsolatedServer(
         step_isolated_data[:1], http_client)
     if output:
       # Guess from the format.
       build_step.supported = (
           isinstance(output, dict) and
           isinstance(output.get('all_tests'), list) and
           isinstance(output.get('per_iteration_data'), list) and
           all(isinstance(i, dict) for i in output.get('per_iteration_data'))
       )