Revert of RELAND of Cross-repo recipe package system.

tests/masters_recipes_test.py

 #!/usr/bin/env python
 # 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 json
 import os
 import subprocess
 import sys
 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',
     'master.chromium.gpu',
     'master.chromium.linux',
     'master.chromium.mac',
     'master.chromium.memory',
     'master.chromium.win',
 ]
 
@@ skipping 59 matching lines @@
     ],
 }
 
 UNUSED_MAIN_WATERFALL_BUILDERS = {
     'master.chromium.linux': [
         'Android x86 Builder (dbg)',
     ],
 }
 
 
-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([
         os.path.join(BASE_DIR, 'scripts', 'tools', 'runit.py'),
         os.path.join(BASE_DIR, 'scripts', 'tools', 'dump_master_cfg.py'),
         os.path.join(BASE_DIR, 'masters/%s' % master),
         f.name])
     return json.load(f)
 
 
 def getBuildersAndRecipes(master):
   return {
       builder['name'] : builder['factory']['properties'].get(
           'recipe', [None])[0]
       for builder in getMasterConfig(master)['builders']
   }
 
 
 def mutualDifference(a, b):
   return a - b, b - a
 
 
 def main(argv):
   chromium_recipe_builders = {}
   covered_builders = set()
   all_builders = set()
 
   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)
 
     # We only have a standardized way to mirror builders using the chromium
     # recipe on the tryserver.
     chromium_recipe_builders[master] = [b for b in builders
                                         if builders[b] == 'chromium']
 
     # TODO(phajdan.jr): Also consider it an error if configured builders
     # 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 = chromium_BUILDERS.get(
+    recipe_side_builders = BUILDERS.get(
         master.replace('master.', ''), {}).get('builders')
     if recipe_side_builders is not None:
       bogus_builders = set(recipe_side_builders.keys()).difference(
           set(builders.keys()))
       bogus_builders, unused = mutualDifference(
           bogus_builders,
           set(UNUSED_MAIN_WATERFALL_BUILDERS.get(master, [])))
       # TODO(phajdan.jr): Clean up bogus chromiumos builders.
       if bogus_builders and master != 'master.chromium.chromiumos':
         exit_code = 1
         print 'The following builders from chromium recipe'
         print 'do not exist in master config for %s:' % master
         print '\n'.join('\t%s' % b for b in sorted(bogus_builders))
       if unused:
         exit_code = 1
         print 'The following unused declarations are superfluous '
         print 'on %s' % master
         print '\n'.join('\t%s' % b for b in sorted(unused))
 
 
   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(
         set(builders.keys()))
     if bogus_builders:
       exit_code = 1
       print 'The following builders from chromium_trybot recipe'
       print 'do not exist in master config for %s:' % master
       print '\n'.join('\t%s' % b for b in sorted(bogus_builders))
 
@@ skipping 39 matching lines @@
     exit_code = 1
     print 'Unused suppressions:'
     print '\n'.join(sorted(
         '\t%s:%s' % (b[0], b[1]) for b in unused_suppressions))
 
   return exit_code
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))