Remove Retrying Failed Tests.

tools/isolate/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 subprocess
@@ skipping 87 matching lines @@
         ('Foo.Bar2', 1),
         ('Foo.Bar3', 1)
     ]
     self._check_results_file(expected_result_file_entries)
 
   def test_simple_fail(self):
     out, err, return_code = RunTest('gtest_fake_fail.py', self.filename)
 
     self.assertEquals(1, return_code)
 
-    test_fail_output = [
+    expected_out_re = [
+      r'\[\d/\d\]   \d\.\d\ds .+',
+      r'\[\d/\d\]   \d\.\d\ds .+',
+      r'\[\d/\d\]   \d\.\d\ds .+',
+      r'\[\d/\d\]   \d\.\d\ds .+',
+      r'\[\d/\d\]   \d\.\d\ds .+',
+      r'\[\d/\d\]   \d\.\d\ds .+',
       re.escape('Note: Google Test filter = Baz.Fail'),
       r'',
     ] + [
       re.escape(l) for l in
       gtest_fake_base.get_test_output('Baz.Fail').splitlines()
     ] + [
       '',
     ] + [
       re.escape(l) for l in gtest_fake_base.get_footer(1, 1).splitlines()
     ] + [
-      ''
-    ]
-
-    expected_out_re = [
-      r'\[\d/\d\]   \d\.\d\ds .+',
-      r'\[\d/\d\]   \d\.\d\ds .+',
-      r'\[\d/\d\]   \d\.\d\ds .+',
-      r'\[\d/\d\]   \d\.\d\ds .+',
-      r'\[\d/\d\]   \d\.\d\ds .+',
-      r'\[\d/\d\]   \d\.\d\ds .+',
-    ] + test_fail_output + [
-      re.escape('Retrying failed tests serially.'),
-      r'\[\d/\d\]   \d\.\d\ds .+',
-    ] + test_fail_output + [
+      '',
       re.escape('Summary:'),
       re.escape('Baz.Fail failed'),
       re.escape('Success:    3 75.00%'),
       re.escape('Flaky:      0  0.00%'),
       re.escape('Fail:       1 25.00%'),
       r'\d+\.\ds Done running 4 tests with 6 executions. \d+\.\d test/s',
     ]
     self._check_results(expected_out_re, out, err)
 
     expected_result_file_entries = [
         ('Foo.Bar1', 1),
         ('Foo.Bar2', 1),
         ('Foo.Bar3', 1),
-        ('Baz.Fail', 4)
+        ('Baz.Fail', 3)
     ]
     self._check_results_file(expected_result_file_entries)
 
   def test_simple_gtest_list_error(self):
     out, err, return_code = RunTest('gtest_fake_error.py')
 
     expected_out_re = [
         'Failed to run .+gtest_fake_error.py',
         'Unable to list tests'
     ]
 
     self.assertEqual(1, return_code)
     self._check_results(expected_out_re, out, err)
 
 
 if __name__ == '__main__':
   VERBOSE = '-v' in sys.argv
   logging.basicConfig(level=logging.DEBUG if VERBOSE else logging.ERROR)
   unittest.main()