Move builders.py and steps.py to chromium_tests.

scripts/slave/recipe_modules/chromium_tests/api.py

Index: scripts/slave/recipe_modules/chromium_tests/api.py
diff --git a/scripts/slave/recipe_modules/chromium_tests/api.py b/scripts/slave/recipe_modules/chromium_tests/api.py
index dcbee88bbf3edfcddcc4a7ca2ff25f63ee22570b..76c11abcd24afca03547e7104f0e9a13aba6c013 100644
--- a/scripts/slave/recipe_modules/chromium_tests/api.py
+++ b/scripts/slave/recipe_modules/chromium_tests/api.py
@@ -10,8 +10,21 @@ 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, {})
@@ -401,7 +414,7 @@ class ChromiumTestsApi(recipe_api.RecipeApi):
     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]