Get rid of the single test_case code path.

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 227 matching lines @@
     expected_out_re = []
     test_cases = (
       'Foo.Bar2',
       'Foo.Bar1',
       'Foo.Bar/3',
     )
 
     for index, name in enumerate(test_cases):
       expected_out_re.append(
           r'\[%d/\d\]   \d\.\d\ds ' % (index + 1) + re.escape(name) + ' .+')
-      expected_out_re.append(re.escape('Note: Google Test filter = ' + name))
-      expected_out_re.append('')
       expected_out_re.extend(
           re.escape(l) for l in
-            gtest_fake_base.get_test_output(name, False).splitlines())
-      expected_out_re.append('')
-      expected_out_re.extend(
-          re.escape(l) for l in gtest_fake_base.get_footer(1, 1).splitlines())
-      expected_out_re.append('')
+            gtest_fake_base.get_test_output_inner(name, False).splitlines())
       expected_out_re.append('')
 
     expected_out_re.extend([
       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, '')
@@ skipping 29 matching lines @@
           # 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'',
+      re.escape(l) for l in
+      gtest_fake_base.get_test_output_inner('Baz.Fail', True).splitlines()
     ] + [
-      re.escape(l) for l in
-      gtest_fake_base.get_test_output('Baz.Fail', True).splitlines()
-    ] + [
-      '',
-    ] + [
-      re.escape(l) for l in gtest_fake_base.get_footer(1, 1).splitlines()
-    ] + [
-      '',
       '',
     ]
 
     expected_out_re = [
       r'\[1/\d\]   \d\.\d\ds .+',
       r'\[2/\d\]   \d\.\d\ds .+',
       r'\[3/\d\]   \d\.\d\ds .+',
       r'\[4/\d\]   \d\.\d\ds .+',
     ] + test_failure_output + [
       # Retries
@@ skipping 50 matching lines @@
     )
 
     for index, name in enumerate(test_cases):
       if index + 1 == len(test_cases):
         # We are about to retry the test serially, so check for the warning.
         expected_out_re.extend(
             re.escape(l) for l in run_test_cases.running_serial_warning())
 
       expected_out_re.append(
           r'\[%d/\d\]   \d\.\d\ds ' % (index + 1) + re.escape(name) + ' .+')
-      expected_out_re.append(re.escape('Note: Google Test filter = ' + name))
-      expected_out_re.append('')
       expected_out_re.extend(
-          re.escape(l) for l in
-            gtest_fake_base.get_test_output(name, 'Fail' in name).splitlines())
-      expected_out_re.append('')
-      expected_out_re.extend(
-          re.escape(l) for l in gtest_fake_base.get_footer(1, 1).splitlines())
-      expected_out_re.append('')
+          re.escape(l)
+          for l in gtest_fake_base.get_test_output_inner(
+              name, 'Fail' in name).splitlines())
       expected_out_re.append('')
 
     expected_out_re.extend([
       re.escape('Failed tests:'),
       re.escape('  Baz.Fail'),
       re.escape('Summary:'),
       re.escape('  Success:    3  75.00%') + r' +\d+\.\d\ds',
       re.escape('    Flaky:    0   0.00%') + r' +\d+\.\d\ds',
       re.escape('     Fail:    1  25.00%') + r' +\d+\.\d\ds',
       r'  \d+\.\d\ds Done running 4 tests with 6 executions. \d+\.\d\d test/s',
@@ skipping 118 matching lines @@
       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()