Move builders.py and steps.py to chromium_tests.

scripts/slave/recipe_modules/chromium_tests/api.py

 # Copyright 2014 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 contextlib
 import copy
 import json
 
 from infra.libs.infra_types import freeze, thaw
 from recipe_engine import recipe_api
 from recipe_engine import util as recipe_util
 
+from . import builders
+from . import steps
+
 
 class ChromiumTestsApi(recipe_api.RecipeApi):
+  def __init__(self, *args, **kwargs):
+    super(ChromiumTestsApi, self).__init__(*args, **kwargs)
+
+  @property
+  def steps(self):
+    return steps
+
+  def load_builder_configs(self, mastername):

[Paweł Hajdan Jr., 2015/06/15 09:09:29]

Why do we need this method? Wasn't this done implicitly in the chromium recipe
module before?

[Adrian Kuegel, 2015/06/15 12:33:22]

As we discussed offline, I will preserve what we currently have, so I removed
this function again and initialized the builders in the constructor.

+    self.m.chromium.add_builders({mastername: builders.BUILDERS[mastername]})

[Paweł Hajdan Jr., 2015/06/15 09:09:29]

Do we still need chromium.add_builders? Do you plan to remove it?

[Adrian Kuegel, 2015/06/15 12:33:22]

I guess it makes sense to move also the builders property and the add_builders
function to here. I did that now. I also moved the two function in chromium
recipe module which directly or indirectly depended on that property to
chromium_tests to avoid a cyclic dependency.

+
   def configure_build(self, mastername, buildername, override_bot_type=None,
 ):
     master_dict = self.m.chromium.builders.get(mastername, {})
     bot_config = master_dict.get('builders', {}).get(buildername)
 
     # Get the buildspec version. It can be supplied as a build property or as
     # a recipe config value.
     buildspec_version = (self.m.properties.get('buildspec_version') or
                          bot_config.get('buildspec_version'))
 
@@ skipping 369 matching lines @@
         build_archive_url=specified_url)
 
       if (self.m.chromium.c.TARGET_PLATFORM == 'android' and
           bot_config.get('root_devices')):
         self.m.adb.root_devices()
 
     # TODO(shinyak): bot_config.get('tests', []) sometimes return tuple.
     tests = list(bot_config.get('tests', []))
 
     if bot_config.get('goma_canary'):
-      tests.insert(0, self.m.chromium.steps.DiagnoseGomaTest())
+      tests.insert(0, steps.DiagnoseGomaTest())
 
     if bot_type in ('tester', 'builder_tester'):
       isolated_targets = [t.isolate_target for t in tests if t.uses_swarming]
       if isolated_targets:
         self.m.isolate.find_isolated_tests(self.m.chromium.output_dir)
 
     return tests
 
   def _make_legacy_build_url(self, master_config, mastername):
     return self.m.archive.legacy_download_url(
@@ skipping 196 matching lines @@
           master_config.get('build_gs_bucket'),
           extra_url_components=None)
     elif (mastername == 'tryserver.chromium.perf' or
           (mastername == 'tryserver.chromium.linux' and
            buildername == 'linux_full_bisect_builder')):
       return None
     else:
       return self.m.archive.legacy_upload_url(
           master_config.get('build_gs_bucket'),
           extra_url_components=self.m.properties['mastername'])