Allow a single trybot to mirror multiple waterfall bots.

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 argparse
 import json
 import os
 import subprocess
 import sys
@@ skipping 68 matching lines @@
         'iOS_Simulator_(dbg)',
     ],
     'master.chromium.memory': [
         'Linux ASan Tests (sandboxed)',
     ],
     'master.chromium.win': [
         'Win x64 Builder (dbg)',
     ],
 }
 
+# TODO(kbr): remove these suppressions. They're only needed
+# temporarily during the transition of the chromium.gpu bots to the
+# Chromium recipe, in order to achieve full code coverage while the
+# bots are actually running a different recipe.
+BOGUS_BUILDER_SUPPRESSIONS = [
+  "GPU Fake Linux Builder",
+  "Fake Linux Release (NVIDIA)"
+]
+
+WRONG_RECIPE_SUPPRESSIONS = [
+  "GPU Fake Linux Builder",
+  "Fake Linux Release (NVIDIA)"
+]
+
 
 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([
@@ skipping 56 matching lines @@
 
     # 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']
 
     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(
-          set(builders.keys()))
+          set(builders.keys())).difference(set(BOGUS_BUILDER_SUPPRESSIONS))
       if bogus_builders:
         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))
 
       other_recipe_builders = set(recipe_side_builders.keys()).difference(
-          set(chromium_recipe_builders[master]))
+          set(chromium_recipe_builders[master])).difference(
+              set(WRONG_RECIPE_SUPPRESSIONS))
       if other_recipe_builders:
         exit_code = 1
         print 'The following builders from chromium recipe'
         print 'are configured to run a different recipe on the master'
         print '(%s):' % master
         print '\n'.join('\t%s' % b for b in sorted(other_recipe_builders))
 
 
   for master in TRYSERVER_MASTERS:
     short_master = master.replace('master.', '')
     builders = getBuildersAndRecipes(master)
     recipe_side_builders = chromium_trybot_BUILDERS[
         short_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))
 
     for builder, recipe in builders.iteritems():
       # Only the chromium_trybot recipe knows how to mirror a main waterfall
       # builder.
       if recipe != 'chromium_trybot':
         continue
 
-      bot_config = recipe_side_builders.get(builder)
-      if not bot_config:
+      bot_configs = recipe_side_builders.get(builder)
+      if not bot_configs:
         continue
 
+      # Support trybots which mirror more than one waterfall bot.
+      # This is identical code to api.chromium_tests.normalize_bot_desc.
+      if not isinstance(bot_configs, (list, tuple)):
+        bot_configs = [bot_configs]
+
       if args.cq_config and builder not in cq_builders.get(short_master, {}):
         continue
 
       # TODO(phajdan.jr): Make it an error if any builders referenced here
       # are not using chromium recipe.
-      main_waterfall_master = 'master.' + bot_config['mastername']
-      bots = [bot_config['buildername']]
-      if bot_config.get('tester'):
-        bots.append(bot_config['tester'])
-      for mw_builder in bots:
-        if mw_builder in chromium_recipe_builders.get(
-            main_waterfall_master, []):
-          covered_builders.add((main_waterfall_master, mw_builder))
+      for bot_config in bot_configs:
+        main_waterfall_master = 'master.' + bot_config['mastername']
+        bots = [bot_config['buildername']]
+        if bot_config.get('tester'):
+          bots.append(bot_config['tester'])
+        for mw_builder in bots:
+          if mw_builder in chromium_recipe_builders.get(
+              main_waterfall_master, []):
+            covered_builders.add((main_waterfall_master, mw_builder))
 
   # TODO(phajdan.jr): Add a way to only count trybots launched by CQ by default.
   print 'Main waterfall ng-trybot coverage: %.2f' % (
       100.0 * len(covered_builders) / len(all_builders))
 
   not_covered_builders = all_builders.difference(covered_builders)
   suppressed_builders = set()
   for master, builders in SUPPRESSIONS.iteritems():
     suppressed_builders.update((master, b) for b in builders)
 
   regressed_builders = not_covered_builders.difference(suppressed_builders)
   if regressed_builders:
     exit_code = 1
     print 'Regression, the following builders lack in-sync tryserver coverage:'
     print '\n'.join(sorted(
         '\t%s:%s' % (b[0], b[1]) for b in regressed_builders))
 
   unused_suppressions = suppressed_builders.difference(not_covered_builders)
   if unused_suppressions:
     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:]))