Refactor test scripts for android to improve performance

build/android/pylib/gtest/test_runner.py

 # 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 logging
 import os
 import re
 
 from pylib import pexpect
 from pylib import ports
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 from pylib.device import device_errors
 from pylib.local import local_test_server_spawner
 from pylib.perf import perf_control
 
+# Test case statuses.
+g_re_run = re.compile('\\[ RUN      \\] ?(.*)\r\n')

[jbudorick, 2015/01/16 14:21:41]

Constants should be ALL_CAPS, not g_with_underscores

[Jaekyun Seok (inactive), 2015/01/18 23:01:18]

Done.

+g_re_fail = re.compile('\\[  FAILED  \\] ?(.*?)( \\((\\d+) ms\\))?\r\r\n')
+g_re_ok = re.compile('\\[       OK \\] ?(.*?)( \\((\\d+) ms\\))?\r\r\n')
+
+# Test run statuses.
+g_re_passed = re.compile('\\[  PASSED  \\] ?(.*)\r\n')
+g_re_runner_fail = re.compile('\\[ RUNNER_FAILED \\] ?(.*)\r\n')
+# Signal handlers are installed before starting tests
+# to output the CRASHED marker when a crash happens.
+g_re_crash = re.compile('\\[ CRASHED      \\](.*)\r\n')
+
 
 def _TestSuiteRequiresMockTestServer(suite_name):
   """Returns True if the test suite requires mock test server."""
   tests_require_net_test_server = ['unit_tests', 'net_unittests',
                                    'content_unittests',
                                    'content_browsertests']
   return (suite_name in
           tests_require_net_test_server)
 
 def _TestSuiteRequiresHighPerfMode(suite_name):
@@ skipping 43 matching lines @@
     """Process the test output.
 
     Args:
       p: An instance of pexpect spawn class.
 
     Returns:
       A TestRunResults object.
     """
     results = base_test_result.TestRunResults()
 
-    # Test case statuses.
-    re_run = re.compile('\\[ RUN      \\] ?(.*)\r\n')
-    re_fail = re.compile('\\[  FAILED  \\] ?(.*?)( \\((\\d+) ms\\))?\r\r\n')
-    re_ok = re.compile('\\[       OK \\] ?(.*?)( \\((\\d+) ms\\))?\r\r\n')
-
-    # Test run statuses.
-    re_passed = re.compile('\\[  PASSED  \\] ?(.*)\r\n')
-    re_runner_fail = re.compile('\\[ RUNNER_FAILED \\] ?(.*)\r\n')
-    # Signal handlers are installed before starting tests
-    # to output the CRASHED marker when a crash happens.
-    re_crash = re.compile('\\[ CRASHED      \\](.*)\r\n')
-
     log = ''
     try:
       while True:
         full_test_name = None
 
-        found = p.expect([re_run, re_passed, re_runner_fail],
+        found = p.expect([g_re_run, g_re_passed, g_re_runner_fail],
                          timeout=self._timeout)
-        if found == 1:  # re_passed
+        if found == 1:  # g_re_passed
           break
-        elif found == 2:  # re_runner_fail
+        elif found == 2:  # g_re_runner_fail
           break
-        else:  # re_run
+        else:  # g_re_run
           full_test_name = p.match.group(1).replace('\r', '')
-          found = p.expect([re_ok, re_fail, re_crash], timeout=self._timeout)
+          found = p.expect([g_re_ok, g_re_fail, g_re_crash],
+                           timeout=self._timeout)
           log = p.before.replace('\r', '')
-          if found == 0:  # re_ok
+          if found == 0:  # g_re_ok
             if full_test_name == p.match.group(1).replace('\r', ''):
               duration_ms = int(p.match.group(3)) if p.match.group(3) else 0
               results.AddResult(base_test_result.BaseTestResult(
                   full_test_name, base_test_result.ResultType.PASS,
                   duration=duration_ms, log=log))
-          elif found == 2:  # re_crash
+          elif found == 2:  # g_re_crash
             results.AddResult(base_test_result.BaseTestResult(
                 full_test_name, base_test_result.ResultType.CRASH,
                 log=log))
             break
-          else:  # re_fail
+          else:  # g_re_fail
             duration_ms = int(p.match.group(3)) if p.match.group(3) else 0
             results.AddResult(base_test_result.BaseTestResult(
                 full_test_name, base_test_result.ResultType.FAIL,
                 duration=duration_ms, log=log))
     except pexpect.EOF:
       logging.error('Test terminated - EOF')
       # We're here because either the device went offline, or the test harness
       # crashed without outputting the CRASHED marker (crbug.com/175538).
       if not self.device.IsOnline():
         raise device_errors.DeviceUnreachableError(
@@ skipping 58 matching lines @@
   #override
   def TearDown(self):
     """Cleans up the test enviroment for the test suite."""
     for s in self._servers:
       s.TearDown()
     if _TestSuiteRequiresHighPerfMode(self.test_package.suite_name):
       self._perf_controller.SetDefaultPerfMode()
     self.test_package.ClearApplicationState(self.device)
     self.tool.CleanUpEnvironment()
     super(TestRunner, self).TearDown()