Get rid of the single test_case code path.

tests/run_test_cases_smoke_test.py

Index: tests/run_test_cases_smoke_test.py
diff --git a/tests/run_test_cases_smoke_test.py b/tests/run_test_cases_smoke_test.py
index 6098124cf5bcc56a17ad8e66d6c60a6b93498e67..16af88a295177cba6259462409760ccfec4db1b3 100755
--- a/tests/run_test_cases_smoke_test.py
+++ b/tests/run_test_cases_smoke_test.py
@@ -245,15 +245,9 @@ class RunTestCases(unittest.TestCase):
     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([
@@ -303,17 +297,9 @@ class RunTestCases(unittest.TestCase):
     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('Baz.Fail', True).splitlines()
-    ] + [
-      '',
+      gtest_fake_base.get_test_output_inner('Baz.Fail', True).splitlines()
     ] + [
-      re.escape(l) for l in gtest_fake_base.get_footer(1, 1).splitlines()
-    ] + [
-      '',
       '',
     ]
 
@@ -384,15 +370,10 @@ class RunTestCases(unittest.TestCase):
 
       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([