Cross-repo recipe package system.

tests/masters_recipes_test.py

Index: tests/masters_recipes_test.py
diff --git a/tests/masters_recipes_test.py b/tests/masters_recipes_test.py
index 54859ecaec7f3681e31734899d6413bed7963b6f..e1c549ff9da9721578418dadb96c33ea01daa9ca 100755
--- a/tests/masters_recipes_test.py
+++ b/tests/masters_recipes_test.py
@@ -13,16 +13,6 @@ import tempfile
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
-sys.path.insert(0, os.path.join(BASE_DIR, 'scripts'))
-sys.path.insert(0, os.path.join(BASE_DIR, 'scripts', 'slave', 'recipes'))
-sys.path.insert(
-    0, os.path.join(BASE_DIR, 'scripts', 'slave', 'recipe_modules'))
-sys.path.insert(0, os.path.join(BASE_DIR, 'third_party'))
-
-import chromium_trybot
-from chromium_tests.builders import BUILDERS
-
-
 MAIN_WATERFALL_MASTERS = [
     'master.chromium.chrome',
     'master.chromium.chromiumos',
@@ -102,6 +92,23 @@ UNUSED_MAIN_WATERFALL_BUILDERS = {
 }
 
 
+def getBuilders(recipe_name):
+  """Asks the given recipe to dump its BUILDERS dictionary.
+
+  This must be implemented by the recipe in question.
+  """
+  (fh, builders_file) = tempfile.mkstemp('.json')
+  os.close(fh)
+  try:
+    subprocess.check_call([
+        os.path.join(BASE_DIR, 'scripts', 'slave', 'recipes.py'),
+        'run', recipe_name, 'dump_builders=%s' % builders_file])
+    with open(builders_file) as fh:
+      return json.load(fh)
+  finally:
+    os.remove(builders_file)
+
+
 def getMasterConfig(master):
   with tempfile.NamedTemporaryFile() as f:
     subprocess.check_call([
@@ -131,6 +138,9 @@ def main(argv):
 
   exit_code = 0
 
+  chromium_trybot_BUILDERS = getBuilders('chromium_trybot')
+  chromium_BUILDERS = getBuilders('chromium')
+
   for master in MAIN_WATERFALL_MASTERS:
     builders = getBuildersAndRecipes(master)
     all_builders.update((master, b) for b in builders)
@@ -144,7 +154,7 @@ def main(argv):
     # are not using chromium recipe. This might make it harder to experiment
     # with switching bots over to chromium recipe though, so it may be better
     # to just wait until the switch is done.
-    recipe_side_builders = BUILDERS.get(
+    recipe_side_builders = chromium_BUILDERS.get(
         master.replace('master.', ''), {}).get('builders')
     if recipe_side_builders is not None:
       bogus_builders = set(recipe_side_builders.keys()).difference(
@@ -167,7 +177,7 @@ def main(argv):
 
   for master in TRYSERVER_MASTERS:
     builders = getBuildersAndRecipes(master)
-    recipe_side_builders = chromium_trybot.BUILDERS[
+    recipe_side_builders = chromium_trybot_BUILDERS[
         master.replace('master.', '')]['builders']
 
     bogus_builders = set(recipe_side_builders.keys()).difference(