Make merging of shard test results handle test suites that are split across shards better.

tools/sharding_supervisor/sharding_supervisor.py

Index: tools/sharding_supervisor/sharding_supervisor.py
diff --git a/tools/sharding_supervisor/sharding_supervisor.py b/tools/sharding_supervisor/sharding_supervisor.py
index 019ebf87c00b27419c812b5eeddae5f872cfea1c..d497fc61e1fbfe4dcb89130898ab839d593eb17b 100755
--- a/tools/sharding_supervisor/sharding_supervisor.py
+++ b/tools/sharding_supervisor/sharding_supervisor.py
@@ -123,6 +123,13 @@ def AppendToXML(final_xml, generic_path, shard):
 
   testcases = shard_node.getElementsByTagName('testcase')
   final_testcases = final_node.getElementsByTagName('testcase')
+
+  final_testsuites = final_node.getElementsByTagName('testsuite')
+  final_testsuites_by_name = {}
+  for final_testsuite in final_testsuites:
+    final_testsuites_by_name[final_testsuite.getAttribute('name')] = \

[M-A Ruel, 2012/07/10 14:26:50]

final_testsuites_by_name = dict(
  (suite.getAttribute('name'), suite) for suite in final_testsuites)

[Mihai Parparita -not on Chrome, 2012/07/10 20:15:16]

Done.

+        final_testsuite
+
   for testcase in testcases:
     name = testcase.getAttribute('name')
     classname = testcase.getAttribute('classname')
@@ -136,6 +143,7 @@ def AppendToXML(final_xml, generic_path, shard):
 
     # Look in our final xml to see if it's there.
     # There has to be a better way...
+    merged_into_final_testcase = False
     for final_testcase in final_testcases:
       final_name = final_testcase.getAttribute('name')
       final_classname = final_testcase.getAttribute('classname')
@@ -145,6 +153,14 @@ def AppendToXML(final_xml, generic_path, shard):
         final_testcase.setAttribute('time', elapsed)
         for failure in failures:
           final_testcase.appendChild(failure)
+        merged_into_final_testcase = True
+
+    # We couldn't find an existing testcase to merge the results into, so we
+    # copy the node into the existing test suite.
+    if not merged_into_final_testcase:
+      testsuite = testcase.parentNode
+      final_testsuite = final_testsuites_by_name[testsuite.getAttribute('name')]

[nsylvain, 2012/07/10 20:16:08]

is it possible that the testsuite is not in the final xml either?

[Mihai Parparita -not on Chrome, 2012/07/10 20:18:57]

That didn't seem to be the case with the data that I copied from a bot (the same
top-level suites appear in each shard file).

+      final_testsuite.appendChild(testcase)
 
   return final_xml
 
@@ -288,7 +304,7 @@ class ShardingSupervisor(object):
   case the number of shards to execute will be the same, but they will be
   smaller, as the total number of shards in the test suite will be multiplied
   by 'total_slaves'.
- 
+
   For example, if you are on a quad core machine, the sharding supervisor by
   default will use 20 shards for the whole suite. However, if you set
   total_slaves to 2, it will split the suite in 40 shards and will only run