[Android] Specify dependency files for instrumentation tests.

build/android/pylib/instrumentation/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.
 
 """Runs the Java tests. See more information on run_instrumentation_tests.py."""
 
 import logging
 import os
 import re
 import shutil
 import sys
 import time
 
 from pylib import android_commands
 from pylib import cmd_helper
 from pylib import constants
 from pylib import forwarder
 from pylib import json_perf_parser
 from pylib import perf_tests_helper
 from pylib import valgrind_tools
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 
 import test_result
 
 
 _PERF_TEST_ANNOTATION = 'PerfTest'
 
 
+def _GetDataFilesForTestSuite(test_suite_basename):
+  """Returns a list of data files/dirs needed by the test suite.
+
+  Args:
+    test_suite_basename: The test suite basename for which to return file paths.
+
+  Returns:
+    A list of test file and directory paths.
+  """
+  test_files = []
+  if test_suite_basename in ['ChromeTest', 'ContentShellTest']:
+    test_files += [
+        'net/data/ssl/certificates/',
+    ]
+  return test_files
+
+
 class TestRunner(base_test_runner.BaseTestRunner):
   """Responsible for running a series of tests connected to a single device."""
 
   _DEVICE_DATA_DIR = 'chrome/test/data'
   _EMMA_JAR = os.path.join(os.environ.get('ANDROID_BUILD_TOP', ''),
                            'external/emma/lib/emma.jar')
   _COVERAGE_MERGED_FILENAME = 'unittest_coverage.es'
   _COVERAGE_WEB_ROOT_DIR = os.environ.get('EMMA_WEB_ROOTDIR')
   _COVERAGE_FILENAME = 'coverage.ec'
   _COVERAGE_RESULT_PATH = ('/data/data/com.google.android.apps.chrome/files/' +
@@ skipping 59 matching lines @@
                         ' : Coverage meta info [' +
                         TestRunner._COVERAGE_META_INFO_PATH +
                         '] does not exist.')
       if (not TestRunner._COVERAGE_WEB_ROOT_DIR or
           not os.path.exists(TestRunner._COVERAGE_WEB_ROOT_DIR)):
         raise Exception('FATAL ERROR in ' + sys.argv[0] +
                         ' : Path specified in $EMMA_WEB_ROOTDIR [' +
                         TestRunner._COVERAGE_WEB_ROOT_DIR +
                         '] does not exist.')
 
-  def CopyTestFilesOnce(self):
-    """Pushes the test data files to the device. Installs the apk if opted."""
+  #override.
+  def PushDependencies(self):
+    # TODO(frankf): Implement a general approach for copying/installing
+    # once across test runners.
     if TestRunner._DEVICE_HAS_TEST_FILES.get(self.device, False):
       logging.warning('Already copied test files to device %s, skipping.',
                       self.device)
       return
+
+    test_data = _GetDataFilesForTestSuite(self.test_pkg.GetApkName())
+    if test_data:
+      # Make sure SD card is ready.
+      self.adb.WaitForSdCardReady(20)
+      for data in test_data:
+        self.CopyTestData([data], self.adb.GetExternalStorage())
+
+    # TODO(frankf): Specify test data in this file as opposed to passing
+    # as command-line.
     for dest_host_pair in self.test_data:
       dst_src = dest_host_pair.split(':',1)
       dst_layer = dst_src[0]
       host_src = dst_src[1]
       host_test_files_path = constants.CHROME_DIR + '/' + host_src
       if os.path.exists(host_test_files_path):
         self.adb.PushIfNeeded(host_test_files_path,
                               self.adb.GetExternalStorage() + '/' +
                               TestRunner._DEVICE_DATA_DIR + '/' + dst_layer)
-    if self.is_uiautomator_test:
+    if self.is_uiautomator_test or self.install_apk:
       self.test_pkg.Install(self.adb)
-    elif self.install_apk:
-      self.test_pkg.Install(self.adb)
-
     self.tool.CopyFiles()
     TestRunner._DEVICE_HAS_TEST_FILES[self.device] = True
 
   def SaveCoverageData(self, test):
     """Saves the Emma coverage data before it's overwritten by the next test.
 
     Args:
       test: the test whose coverage data is collected.
     """
     if not self.coverage:
@@ skipping 60 matching lines @@
   def SetUp(self):
     """Sets up the test harness and device before all tests are run."""
     super(TestRunner, self).SetUp()
     if not self.adb.IsRootEnabled():
       logging.warning('Unable to enable java asserts for %s, non rooted device',
                       self.device)
     else:
       if self.adb.SetJavaAssertsEnabled(enable=not self.disable_assertions):
         self.adb.Reboot(full_reboot=False)
 
-    self.CopyTestFilesOnce()
     # We give different default value to launch HTTP server based on shard index
     # because it may have race condition when multiple processes are trying to
     # launch lighttpd with same port at same time.
     http_server_ports = self.LaunchTestHttpServer(
         os.path.join(constants.CHROME_DIR), self._lighttp_port)
     if self.ports_to_forward:
       port_pairs = [(port, port) for port in self.ports_to_forward]
       # We need to remember which ports the HTTP server is using, since the
       # forwarder will stomp on them otherwise.
       port_pairs.append(http_server_ports)
@@ skipping 217 matching lines @@
         duration_ms = 0
       message = str(e)
       if not message:
         message = 'No information.'
       results.AddResult(test_result.InstrumentationTestResult(
           test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms,
           log=message))
       raw_result = None
     self.TestTeardown(test, raw_result)
     return (results, None if results.DidRunPass() else test)