Implement clustering support in run_test_cases.py.

tests/run_test_cases_smoke_test.py

 #!/usr/bin/env 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.
 
 import json
 import logging
 import os
 import re
 import shutil
@@ skipping 136 matching lines @@
     for (entry_name, entry_count) in test_cases:
       self.assertTrue(entry_name in actual['test_cases'])
       self.assertEqual(
           entry_count,
           len(actual['test_cases'][entry_name]),
           (entry_count, len(actual['test_cases'][entry_name]), entry_name))
 
   def test_simple_pass(self):
     out, err, return_code = RunTest(
         [
+          '--clusters', '1',
           '--jobs', '3',
           '--result', self.filename,
           os.path.join(ROOT_DIR, 'tests', 'gtest_fake', 'gtest_fake_pass.py'),
         ])
 
     self.assertEqual(0, return_code)
 
     expected_out_re = [
       r'\[\d/\d\]   \d\.\d\ds .+',
       r'\[\d/\d\]   \d\.\d\ds .+',
@@ skipping 10 matching lines @@
         ('Foo.Bar1', 1),
         ('Foo.Bar2', 1),
         ('Foo.Bar/3', 1)
     ]
     self._check_results_file(
         fail=[],
         flaky=[],
         success=sorted([u'Foo.Bar1', u'Foo.Bar2', u'Foo.Bar/3']),
         test_cases=test_cases)
 
+  def test_simple_pass_cluster(self):
+    out, err, return_code = RunTest(
+        [
+          '--clusters', '10',
+          '--jobs', '1',
+          '--result', self.filename,
+          os.path.join(ROOT_DIR, 'tests', 'gtest_fake', 'gtest_fake_pass.py'),
+        ])
+
+    self.assertEqual(0, return_code)
+
+    expected_out_re = [
+      r'\[\d/\d\]   \d\.\d\ds .+',
+      r'\[\d/\d\]   \d\.\d\ds .+',
+      r'\[\d/\d\]   \d\.\d\ds .+',
+      re.escape('Summary:'),
+      re.escape('  Success:    3 100.00% ') + r' +\d+\.\d\ds',
+      re.escape('    Flaky:    0   0.00% ') + r' +\d+\.\d\ds',
+      re.escape('     Fail:    0   0.00% ') + r' +\d+\.\d\ds',
+      r'  \d+\.\d\ds Done running 3 tests with 3 executions. \d+\.\d\d test/s',
+    ]
+    self._check_results(expected_out_re, out, err)
+
+    test_cases = [
+        ('Foo.Bar1', 1),
+        ('Foo.Bar2', 1),
+        ('Foo.Bar/3', 1)
+    ]
+    self._check_results_file(
+        fail=[],
+        flaky=[],
+        success=sorted([u'Foo.Bar1', u'Foo.Bar2', u'Foo.Bar/3']),
+        test_cases=test_cases)
+
   def test_simple_pass_verbose(self):
     # We take verbosity seriously so test it.
     out, err, return_code = RunTest(
         [
           # Linearize execution.
+          '--clusters', '1',
           '--jobs', '1',
           '--verbose',
           '--result', self.filename,
           os.path.join(ROOT_DIR, 'tests', 'gtest_fake', 'gtest_fake_pass.py'),
         ])
 
     self.assertEqual(0, return_code)
 
     expected_out_re = []
     test_cases = (
@@ skipping 28 matching lines @@
     self.assertTrue(
         re.match(
             r'INFO  run_test_cases\(\d+\)\: Found 3 test cases in \S+ '
             r'\S+gtest_fake_pass.py',
             err.strip()),
         err)
 
   def test_simple_fail(self):
     out, err, return_code = RunTest(
         [
+          # Linearize execution.
+          '--clusters', '1',
           '--jobs', '1',
           '--result', self.filename,
           os.path.join(ROOT_DIR, 'tests', 'gtest_fake', 'gtest_fake_fail.py'),
         ])
 
     self.assertEqual(1, return_code)
 
     test_failure_output = [
       re.escape('Note: Google Test filter = Baz.Fail'),
       r'',
@@ skipping 42 matching lines @@
         fail=['Baz.Fail'],
         flaky=[],
         success=[u'Foo.Bar1', u'Foo.Bar2', u'Foo.Bar3'],
         test_cases=test_cases)
 
   def test_simple_fail_verbose(self):
     # We take verbosity seriously so test it.
     out, err, return_code = RunTest(
         [
           # Linearize execution.
+          '--clusters', '1',
           '--jobs', '1',
           '--verbose',
           '--result', self.filename,
           os.path.join(ROOT_DIR, 'tests', 'gtest_fake', 'gtest_fake_fail.py'),
         ])
 
     self.assertEqual(1, return_code)
 
     expected_out_re = []
     test_cases = (
@@ skipping 90 matching lines @@
     self.assertEqual('', err)
     self.assertEqual(expected_out, out)
     self.assertEqual(0, return_code)
 
   def test_flaky_stop_early(self):
     # gtest_fake_flaky.py has Foo.Bar[1-9]. Each of the test fails once and
     # succeeds on the second pass.
     out, err, return_code = RunTest(
         [
           '--result', self.filename,
-          # Make it determinist.
+          # Linearize execution.
           '--clusters', '1',
           '--jobs', '1',
           '--retries', '1',
           '--max-failures', '2',
           os.path.join(
             ROOT_DIR, 'tests', 'gtest_fake', 'gtest_fake_flaky.py'),
           self.tempdirpath,
         ])
     self.assertEqual(1, return_code)
     # Give up on checking the stdout.
@@ skipping 12 matching lines @@
         test_cases=test_cases)
 
   def test_flaky_stop_early_xml(self):
     # Create an unique filename and delete the file.
     os.remove(self.filename)
     _, err, return_code = RunTest(
         [
           # In that case, it's an XML file even if it has the wrong extension.
           '--gtest_output=xml:' + self.filename,
           '--no-dump',
-          # Make it determinist.
+          # Linearize execution.
           '--clusters', '1',
           '--jobs', '1',
           '--retries', '1',
           '--max-failures', '2',
           os.path.join(
             ROOT_DIR, 'tests', 'gtest_fake', 'gtest_fake_flaky.py'),
           self.tempdirpath,
         ])
     self.assertEqual(1, return_code)
     # Give up on checking the stdout.
     #self.assertTrue('STOPPED EARLY' in out, out)
     self.assertEqual('', err)
     try:
       actual_xml = load_xml_as_string_and_filter(self.filename)
     except Exception as e:
       print >> sys.stderr, e
       print >> sys.stderr, self.filename
       with open(self.filename, 'rb') as f:
         print >> sys.stderr, f.read()
       self.fail()
     expected_xml = load_xml_as_string_and_filter(
         os.path.join(ROOT_DIR, 'tests', 'gtest_fake', 'expected.xml'))
     self.assertEqual(expected_xml, actual_xml)
 
 
 if __name__ == '__main__':
   VERBOSE = '-v' in sys.argv
   logging.basicConfig(level=logging.DEBUG if VERBOSE else logging.ERROR)
   unittest.main()