Remove Retrying Failed Tests.

Each test only gets 3 chances to pass when running in run_test_case.py. If it fails those 3 it no longer gets to be retried running alone.


BUG=


Review URL: https://chromiumcodereview.appspot.com/10825448

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152366 0039d316-1c4b-4281-b951-d872f2087c98

tools/isolate/run_test_cases.py

@@ -587,26 +587,6 @@ def run_test_cases(executable, test_cases, jobs, timeout, result_file):
     else:
       assert False, items
 
-  # Retry all the failures serially to see if they are just flaky when
-  # run at the same time.
-  if fail:
-    print 'Retrying failed tests serially.'
-    progress = Progress(len(fail))
-    function = Runner(
-        executable, os.getcwd(), timeout, progress, retry_count=1).map
-    test_cases_retry = fail[:]
-
-    for test_case in test_cases_retry:
-      output = function(test_case)
-      progress.print_update()
-      results[output[0]['test_case']].append(output)
-      if not output[0]['returncode']:
-        fail.remove(test_case)
-        flaky.append(test_case)
-
-    LogResults(result_file, results)
-    sys.stdout.write('\n')
-
   print 'Summary:'
   for test_case in sorted(flaky):
     items = results[test_case]

tools/isolate/run_test_cases_smoke_test.py

@@ -105,7 +105,13 @@ class TraceTestCases(unittest.TestCase):
 
     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'',
     ] + [
@@ -116,20 +122,7 @@ class TraceTestCases(unittest.TestCase):
     ] + [
       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%'),
@@ -143,7 +136,7 @@ class TraceTestCases(unittest.TestCase):
         ('Foo.Bar1', 1),
         ('Foo.Bar2', 1),
         ('Foo.Bar3', 1),
-        ('Baz.Fail', 4)
+        ('Baz.Fail', 3)
     ]
     self._check_results_file(expected_result_file_entries)