[Android] Move Xvfb and TimeProfile from run_tests.py into individual files.

build/android/run_tests.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.
 
 """Runs all the native unit tests.
 
 1. Copy over test binary to /data/local on device.
 2. Resources: chrome/unit_tests requires resources (chrome.pak and en-US.pak)
@@ skipping 37 matching lines @@
 import emulator
 from pylib import android_commands
 from pylib import buildbot_report
 from pylib import cmd_helper
 from pylib import debug_info
 from pylib import ports
 from pylib import run_tests_helper
 from pylib import test_options_parser
 from pylib.base_test_sharder import BaseTestSharder
 from pylib.single_test_runner import SingleTestRunner
+from pylib.utils import time_profile
+from pylib.utils import xvfb
 
 
 _TEST_SUITES = ['base_unittests',
                 'cc_unittests',
                 'content_unittests',
                 'gpu_unittests',
                 'ipc_tests',
                 'media_unittests',
                 'net_unittests',
                 'sql_unittests',
@@ skipping 30 matching lines @@
                              for t in all_test_suites]
   for t, q in zip(all_test_suites, qualified_test_suites):
     if not os.path.exists(q):
       raise Exception('Test suite %s not found in %s.\n'
                       'Supported test suites:\n %s\n'
                       'Ensure it has been built.\n' %
                       (t, q, _TEST_SUITES))
   return qualified_test_suites
 
 
-class TimeProfile(object):
-  """Class for simple profiling of action, with logging of cost."""
-
-  def __init__(self, description):
-    self._description = description
-    self.Start()
-
-  def Start(self):
-    self._starttime = time.time()
-
-  def Stop(self):
-    """Stop profiling and dump a log."""
-    if self._starttime:
-      stoptime = time.time()
-      logging.info('%fsec to perform %s',
-                   stoptime - self._starttime, self._description)
-      self._starttime = None
-
-
-class Xvfb(object):
-  """Class to start and stop Xvfb if relevant.  Nop if not Linux."""
-
-  def __init__(self):
-    self._pid = 0
-
-  def _IsLinux(self):
-    """Return True if on Linux; else False."""
-    return sys.platform.startswith('linux')
-
-  def Start(self):
-    """Start Xvfb and set an appropriate DISPLAY environment.  Linux only.
-
-    Copied from tools/code_coverage/coverage_posix.py
-    """
-    if not self._IsLinux():
-      return
-    proc = subprocess.Popen(['Xvfb', ':9', '-screen', '0', '1024x768x24',
-                             '-ac'],
-                            stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    self._pid = proc.pid
-    if not self._pid:
-      raise Exception('Could not start Xvfb')
-    os.environ['DISPLAY'] = ':9'
-
-    # Now confirm, giving a chance for it to start if needed.
-    for _ in range(10):
-      proc = subprocess.Popen('xdpyinfo >/dev/null', shell=True)
-      _, retcode = os.waitpid(proc.pid, 0)
-      if retcode == 0:
-        break
-      time.sleep(0.25)
-    if retcode != 0:
-      raise Exception('Could not confirm Xvfb happiness')
-
-  def Stop(self):
-    """Stop Xvfb if needed.  Linux only."""
-    if self._pid:
-      try:
-        os.kill(self._pid, signal.SIGKILL)
-      except:
-        pass
-      del os.environ['DISPLAY']
-      self._pid = 0
-
-
 class TestSharder(BaseTestSharder):
   """Responsible for sharding the tests on the connected devices."""
 
   def __init__(self, attached_devices, test_suite, gtest_filter,
                test_arguments, timeout, cleanup_test_files, tool,
                log_dump_name, fast_and_loose, build_type, in_webkit_checkout,
                flakiness_server=None):
     BaseTestSharder.__init__(self, attached_devices, build_type)
     self.test_suite = test_suite
     self.gtest_filter = gtest_filter or ''
@@ skipping 121 matching lines @@
   Returns:
     0 if successful, number of failing tests otherwise.
   """
   step_name = os.path.basename(options.test_suite).replace('-debug.apk', '')
   buildbot_report.PrintNamedStep(step_name)
   attached_devices = []
   buildbot_emulators = []
 
   if options.use_emulator:
     for n in range(options.emulator_count):
-      t = TimeProfile('Emulator launch %d' % n)
+      t = time_profile.TimeProfile('Emulator launch %d' % n)
       avd_name = None
       if n > 0:
         # Creates a temporary AVD for the extra emulators.
         avd_name = 'run_tests_avd_%d' % n
       buildbot_emulator = emulator.Emulator(avd_name, options.fast_and_loose)
       buildbot_emulator.Launch(kill_all_emulators=n == 0)
       t.Stop()
       buildbot_emulators.append(buildbot_emulator)
       attached_devices.append(buildbot_emulator.device)
     # Wait for all emulators to boot completed.
@@ skipping 49 matching lines @@
     options: options for running the tests.
 
   Returns:
     0 if successful, number of failing tests otherwise.
   """
   if options.test_suite == 'help':
     ListTestSuites()
     return 0
 
   if options.use_xvfb:
-    xvfb = Xvfb()
-    xvfb.Start()
+    framebuffer = xvfb.Xvfb()
+    framebuffer.Start()
 
   all_test_suites = FullyQualifiedTestSuites(options.exe, options.test_suite,
                                              options.build_type)
   failures = 0
   for suite in all_test_suites:
     # Give each test suite its own copy of options.
     test_options = copy.deepcopy(options)
     test_options.test_suite = suite
     failures += _RunATestSuite(test_options)
 
   if options.use_xvfb:
-    xvfb.Stop()
+    framebuffer.Stop()
   return failures
 
 
 def ListTestSuites():
   """Display a list of available test suites."""
   print 'Available test suites are:'
   for test_suite in _TEST_SUITES:
     print test_suite
 
 
@@ skipping 70 matching lines @@
   # the batch (this happens because the exit status is a sum of all failures
   # from all suites, but the buildbot associates the exit status only with the
   # most recent step).
   if options.exit_code:
     return failed_tests_count
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))