Split up Each Swarm Test into Two Steps

scripts/master/factory/swarm_factory.py

 # 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.
 
 """Utility class to build the swarm master BuildFactory's.
 
 Based on chromium_factory.py and adds chromium-specific steps."""
 
 import os
 
@@ skipping 10 matching lines @@
                                    factory_properties, gclient_deps)
 
     swarm_command_obj = swarm_commands.SwarmCommands(factory,
                                                      target,
                                                      self._build_dir,
                                                      self._target_platform)
 
     gclient_env = factory_properties.get("gclient_env")
     gyp_defines = gclient_env['GYP_DEFINES']
     if 'tests_run=hashtable' in gyp_defines:
-      for test in tests:
-        swarm_command_obj.AddSwarmTestStep(self._target_platform,
+      # Send of all the test requests as a single step.
+      swarm_inputs = [os.path.join('src', 'out', target, test + '.results')
+                      for test in tests]
+      swarm_command_obj.AddSendSwarmTestStep(self._target_platform,

[M-A Ruel, 2012/04/17 20:16:00]

That's weird that triggering the jobs are all done at once but getting the
results are independent steps. I think it'd be better to not send a list to
AddSendSwarmTestStep() and call it in a loop instead, like it is done for
AddGetSwarmTestStep(). Or at least have both be the same.

Any opinion on that?

[csharp, 2012/04/18 18:20:29]

Well the test triggers will soon all be one step, so I don't want to break that
apart.

I left GetSwarmTestStep in a loop because it just seemed cleaner to me to have
each command function associated with exactly 1 step being created. If you think
it looks better to hide the loop inside the command then I have no problem
making that change.

             factory_properties.get('swarm_server', 'localhost'),
             factory_properties.get('swarm_port', '9001'),
             factory_properties.get('min_swarm_shards', '3'),
             factory_properties.get('max_swarm_shards', '3'),
-            os.path.join('src', 'out', target, test + '.results'),
+            swarm_inputs,
+            tests)
+
+      # Each test has its output returned as its own step.
+      for test in tests:
+        swarm_command_obj.AddGetSwarmTestStep(
+            factory_properties.get('swarm_server', 'localhost'),
+            factory_properties.get('swarm_port', '9001'),
             test)
 
     return factory