Break config_default into master_site_configs.

test/masters_cfg_test.py

 #!/usr/bin/env python
 # Copyright 2012 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.
 
 """Tests all master.cfgs to make sure they load properly."""
 
 import collections
 import optparse
 import os
 import subprocess
 import sys
 import time
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.insert(0, os.path.join(BASE_DIR, 'scripts'))
 
 import masters_util
 
 from common import chromium_utils
 from common import master_cfg_utils
 
 # Masters which do not currently load from the default configuration. These need
 # to be fixed and removed from the list!
 BLACKLIST = set(['chromium.swarm',
                  'chromium.chromebot',
-                 'chromiumos.tryserver',
-                 'client.nacl.chrome'])
+                 'client.nacl.chrome'
+                 ])
 
 
 Cmd = collections.namedtuple('Cmd', ['name', 'path', 'env'])
 
 
 def GetMasterCmds(masters, blacklist, pythonpaths):
   assert blacklist <= set(m for m, _ in masters)
   env = os.environ.copy()
   pythonpaths = list(pythonpaths or [])
   buildpaths = ['scripts', 'third_party', 'site_config']
@@ skipping 60 matching lines @@
       print GetCommandStr(cmd, out)
 
   test_time = round(time.time() - start_time, 1)
   print 'Parsed %d masters successfully, %d failed, %d skipped in %gs.' % (
       len(masters_list), len(failures), num_skipped, test_time)
   return bool(failures)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))