Fix apptest runner retry logic and output parsing.

mojo/tools/mopy/gtest.py

 # Copyright 2014 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 logging
 import os
 import Queue
 import re
 import subprocess
 import sys
@@ skipping 44 matching lines @@
     # Abort when 20 fixtures, or a tenth of the apptest fixtures, have failed.
     # base::TestLauncher does this for timeouts and unknown results.
     if len(failed) >= max(20, len(fixtures) / 10):
       print 'Too many failing fixtures (%d), exiting now.' % len(failed)
       return (fixtures, failed + [apptest + ' aborted for excessive failures.'])
   return (fixtures, failed)
 
 
 # TODO(msw): Determine proper test retry counts; allow configuration.
 def _run_apptest_with_retry(config, shell, args, apptest, retry_count=2):
-  '''Runs an apptest, retrying on failure; returns the tests and failures.'''
+  '''Runs an apptest, retrying on failure; returns the fixtures and failures.'''
   (tests, failed) = _run_apptest(config, shell, args, apptest)
-  for retry in range(retry_count if failed else 0):
-    print 'Retrying failed tests: retry %s/%s.' % (retry + 1, retry_count)
-    # Retry only the failing fixtures; gtest honors its final filter argument.
-    arguments = args + ['--gtest_filter=%s' % ':'.join(failed)]
-    (_, failed) = _run_apptest(config, shell, arguments, apptest)
+  while failed and retry_count:
+    print 'Retrying failed tests (%d attempts remaining)' % retry_count
+    arguments = args
+    # Retry only the failing fixtures if there is no existing filter specified.
+    if failed != [apptest] and not [a for a in args if '--gtest_filter=' in a]:
+      arguments += ['--gtest_filter=%s' % ':'.join(failed)]
+    failed = _run_apptest(config, shell, arguments, apptest)[1]
+    retry_count -= 1
   return (tests, failed)
 
 
 def _run_apptest(config, shell, args, apptest):
-  '''Runs an apptest; returns the list of tests and the list of failures.'''
+  '''Runs an apptest; returns the list of fixtures and the list of failures.'''
   command = _build_command_line(config, args, apptest)
   logging.getLogger().debug('Command: %s' % ' '.join(command))
   start_time = time.time()
 
   try:
     output = _run_test_with_xvfb(config, shell, args, apptest)
   except Exception as e:
     _print_exception(command, e)
     return ([apptest], [apptest])
 
   # Find all fixtures begun from gtest's '[ RUN      ] <Suite.Fixture>' output.
   tests = [x for x in output.split('\n') if x.find('[ RUN      ] ') != -1]
-  # The '[ RUN      ] ' string is 23 chars with colored output escape sequences.
-  substring_length = 13 if config.target_os == Config.OS_ANDROID else 23
-  tests = [x.strip(' \t\n\r')[substring_length:] for x in tests]
+  tests = [x.strip(' \t\n\r')[x.find('[ RUN      ] ') + 13:] for x in tests]
 
   # Fail on output with gtest's '[  FAILED  ]' or a lack of '[       OK ]'.
   # The latter check ensures failure on broken command lines, hung output, etc.
   # Check output instead of exit codes because mojo shell always exits with 0.
   failed = [x for x in tests if (re.search('\[  FAILED  \].*' + x, output) or
                                  not re.search('\[       OK \].*' + x, output))]
 
   ms = int(round(1000 * (time.time() - start_time)))
   if failed:
     _print_exception(command, output, ms)
@@ skipping 130 matching lines @@
       (r, w) = os.pipe()
       with os.fdopen(r, 'r') as rf:
         with os.fdopen(w, 'w') as wf:
           arguments = args + [apptest]
           shell.StartActivity('MojoShellActivity', arguments, wf, wf.close)
           output = rf.read()
   except Exception as e:
     output += (e.output + '\n') if hasattr(e, 'output') else ''
     exception += str(e)
   result.put((output, exception))