Support Kerberos on Android

build/android/pylib/gtest/test_package_apk.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.
 
 """Defines TestPackageApk to help run APK-based native tests."""
 # pylint: disable=W0212
 
 import itertools
 import logging
 import os
@@ skipping 18 matching lines @@
 
   def __init__(self, suite_name):
     """
     Args:
       suite_name: Name of the test suite (e.g. base_unittests).
     """
     TestPackage.__init__(self, suite_name)
     self.suite_path = os.path.join(
         constants.GetOutDirectory(), '%s_apk' % suite_name,
         '%s-debug.apk' % suite_name)
     if suite_name == 'content_browsertests':

[jbudorick, 2015/06/19 15:15:19]

We do some special-casing for our browser test suites directly in here. Why do
we need to have a hook through _StartActivity and SpawnTestProcess to support a
special case for net_unittests?

[aberent, 2015/06/19 17:59:39]

Done. You are right, I was thinking we might have other cases where we wanted to
do this, but we don't at the moment so it is simpler to just special case this
here.

       self._package_info = constants.PACKAGE_INFO['content_browsertests']
     elif suite_name == 'components_browsertests':
       self._package_info = constants.PACKAGE_INFO['components_browsertests']
     else:
       self._package_info = constants.PACKAGE_INFO['gtest']
 
   def _CreateCommandLineFileOnDevice(self, device, options):
     device.WriteFile(self._package_info.cmdline_file,
                      self.suite_name + ' ' + options)
 
@@ skipping 13 matching lines @@
         logging.info('Fifo created. Slept for %f secs' % (i * 0.5))
         break
       time.sleep(0.5)
     else:
       raise device_errors.DeviceUnreachableError(
           'Unable to find fifo on device %s ' % self._GetFifo())
     args = shlex.split(device.old_interface.Adb()._target_arg)
     args += ['shell', 'cat', self._GetFifo()]
     return pexpect.spawn('adb', args, timeout=timeout, logfile=logfile)
 
-  def _StartActivity(self, device, force_stop=True):
+  def _StartActivity(self, device, tests_run_in_subthread=False,
+                     force_stop=True):
+    if tests_run_in_subthread:
+      extras = {'RunInSubThread':''}

[jbudorick, 2015/06/19 15:15:19]

nit: space after :

[aberent, 2015/06/19 17:59:40]

Done.

+    else:
+      extras = []
     device.StartActivity(
         intent.Intent(package=self._package_info.package,
                       activity=self._package_info.activity,
-                      action='android.intent.action.MAIN'),
+                      action='android.intent.action.MAIN',
+                      extras=extras),
         # No wait since the runner waits for FIFO creation anyway.
         blocking=False,
         force_stop=force_stop)
 
   #override
   def ClearApplicationState(self, device):
     device.ClearApplicationState(self._package_info.package)
     # Content shell creates a profile on the sdscard which accumulates cache
     # files over time.
     if self.suite_name == 'content_browsertests':
@@ skipping 32 matching lines @@
       p = self._WatchFifo(device, timeout=30 * self.tool.GetTimeoutScale())
       p.expect('<<ScopedMainEntryLogger')
       p.close()
     finally:
       self.tool.CleanUpEnvironment()
     # We need to strip the trailing newline.
     content = [line.rstrip() for line in p.before.splitlines()]
     return gtest_test_instance.ParseGTestListTests(content)
 
   #override
-  def SpawnTestProcess(self, device):
+  def SpawnTestProcess(self, device, tests_run_in_subthread=False):
     try:
       self.tool.SetupEnvironment()
       self._ClearFifo(device)
       # Doesn't need to stop an Activity because ClearApplicationState() is
       # always called before this call and so it is already stopped at this
       # point.
-      self._StartActivity(device, force_stop=False)
+      self._StartActivity(device, tests_run_in_subthread, force_stop=False )
     finally:
       self.tool.CleanUpEnvironment()
     logfile = android_commands.NewLineNormalizer(sys.stdout)
     return self._WatchFifo(device, timeout=10, logfile=logfile)
 
   #override
   def Install(self, device):
     self.tool.CopyFiles(device)
     device.Install(self.suite_path)
 
   #override
   def PullAppFiles(self, device, files, directory):
     local_device_gtest_run.PullAppFilesImpl(
         device, self._package_info.package, files, directory)