Make sharding_supervisor.py run InProcessBrowserTest.Empty

tools/sharding_supervisor/sharding_supervisor.py

Index: tools/sharding_supervisor/sharding_supervisor.py
===================================================================
--- tools/sharding_supervisor/sharding_supervisor.py	(revision 144098)
+++ tools/sharding_supervisor/sharding_supervisor.py	(working copy)
@@ -597,6 +597,7 @@
     parser.error("You must have at least 1 run per core!")
   num_runs = num_cores * options.runs_per_core
 
+  test = args[0]
   gtest_args = ["--gtest_color=%s" % {
       True: "yes", False: "no"}[options.color]] + args[1:]
 
@@ -623,13 +624,27 @@
     if (options.runshard < 0 or options.runshard >= num_shards_to_run):
       parser.error("Invalid shard number given parameters!")
     shard = RunShard(
-        args[0], num_shards_to_run, options.runshard, gtest_args, None, None)
+        test, num_shards_to_run, options.runshard, gtest_args, None, None)
     shard.communicate()
     return shard.poll()
 
+  # When running browser_tests, load the test binary into memory before running
+  # any tests. This is needed to prevent loading it from disk causing the first
+  # run tests to timeout flakily. See: http://crbug.com/124260
+  if test.find("browser_tests") > -1:

[Paweł Hajdan Jr., 2012/06/27 07:48:52]

nit: Why not 'browser_tests' in test?

[mmenke, 2012/06/27 16:14:48]

Mostly because I don't really know Python.  Done.

+    args = [test]
+    args.extend(gtest_args)
+    args.append("warmup")
+    result = subprocess.call(args,
+                             bufsize=0,
+                             universal_newlines=True)
+    # If the test fails, don't run anything else.
+    if result != 0:
+      return result
+
   # shard and run the whole test
   ss = ShardingSupervisor(
-      args[0], num_shards_to_run, num_runs, options.color,
+      test, num_shards_to_run, num_runs, options.color,
       options.original_order, options.prefix, options.retry_percent,
       options.timeout, options.total_slaves, options.slave_index, gtest_args)
   return ss.ShardTest()