Split up Each Swarm Test into Two Steps

masters/master.chromium.swarm/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 
 # Copyright (c) 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.
 
 from buildbot.changes import svnpoller
 from buildbot.scheduler import Scheduler
 
@@ skipping 70 matching lines @@
 
 builders = []
 
 def SetupSwarmTests(machine, project=None):
   return machine.SwarmFactory(
       tests=['base_unittests', 'net_unittests'],
       options=['base_unittests_run', 'net_unittests_run'],
       project=project,
       factory_properties={
           'gclient_env' : {'GYP_DEFINES': 'tests_run=hashtable'},
-          'swarm_port' : '9001',
-          'swarm_server' : 'vm155-m1'})
+          'swarm_server' : 'http://vm155-m1:9001/'})
 
 
 # ----------------------------------------------------------------------------
 # FACTORIES
 
 m_linux = swarm_factory.SwarmFactory('src/build',
                                      target_platform='linux2')
 f_chromium_linux_swarm = SetupSwarmTests(m_linux)
 
 m_win = swarm_factory.SwarmFactory('src/build',
@@ skipping 51 matching lines @@
 master_utils.AutoSetupMaster(c, ActiveMaster,
     public_html="../master.chromium.git/public_html",
     templates=['../master.chromium/templates'],
     enable_http_status_push=ActiveMaster.is_production_host)
 
 ####### PROJECT IDENTITY
 
 c['projectName'] = ActiveMaster.project_name
 c['projectURL'] = config.Master.project_url
 c['buildbotURL'] = 'http://build.chromium.org/p/chromium.swarm/'