Revert of [android] Stop using isolate.py for data dependency management.

build/android/pylib/instrumentation/instrumentation_test_instance.py

 # Copyright 2015 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 collections
 import copy
 import logging
 import os
 import pickle
 import re
 
 from devil.android import apk_helper
 from devil.android import md5sum
 from pylib import constants
 from pylib.base import base_test_result
 from pylib.base import test_exception
 from pylib.base import test_instance
 from pylib.constants import host_paths
 from pylib.instrumentation import test_result
 from pylib.instrumentation import instrumentation_parser
+from pylib.utils import isolator
 from pylib.utils import proguard
 
 with host_paths.SysPath(host_paths.BUILD_COMMON_PATH):
   import unittest_util # pylint: disable=import-error
 
 # Ref: http://developer.android.com/reference/android/app/Activity.html
 _ACTIVITY_RESULT_CANCELED = 0
 _ACTIVITY_RESULT_OK = -1
 
 _COMMAND_LINE_PARAMETER = 'cmdlinearg-parameter'
@@ skipping 361 matching lines @@
     flags = test['flags']
     if flags.add:
       display_name = '%s with {%s}' % (display_name, ' '.join(flags.add))
     if flags.remove:
       display_name = '%s without {%s}' % (display_name, ' '.join(flags.remove))
   return display_name
 
 
 class InstrumentationTestInstance(test_instance.TestInstance):
 
-  def __init__(self, args, data_deps_delegate, error_func):
+  def __init__(self, args, isolate_delegate, error_func):
     super(InstrumentationTestInstance, self).__init__()
 
     self._additional_apks = []
     self._apk_under_test = None
     self._apk_under_test_incremental_install_script = None
     self._package_info = None
     self._suite = None
     self._test_apk = None
     self._test_apk_incremental_install_script = None
     self._test_jar = None
     self._test_package = None
     self._test_runner = None
     self._test_support_apk = None
     self._initializeApkAttributes(args, error_func)
 
     self._data_deps = None
-    self._data_deps_delegate = None
-    self._runtime_deps_path = None
-    self._initializeDataDependencyAttributes(args, data_deps_delegate)
+    self._isolate_abs_path = None
+    self._isolate_delegate = None
+    self._isolated_abs_path = None
+    self._initializeDataDependencyAttributes(args, isolate_delegate)
 
     self._annotations = None
     self._excluded_annotations = None
     self._test_filter = None
     self._initializeTestFilterAttributes(args)
 
     self._flags = None
     self._initializeFlagAttributes(args)
 
     self._driver_apk = None
@@ skipping 79 matching lines @@
           break
     if not self._package_info:
       logging.warning('Unable to find package info for %s', self._test_package)
 
     for apk in args.additional_apks:
       if not os.path.exists(apk):
         error_func('Unable to find additional APK: %s' % apk)
     self._additional_apks = (
         [apk_helper.ToHelper(x) for x in args.additional_apks])
 
-  def _initializeDataDependencyAttributes(self, args, data_deps_delegate):
+  def _initializeDataDependencyAttributes(self, args, isolate_delegate):
     self._data_deps = []
-    self._data_deps_delegate = data_deps_delegate
-    self._runtime_deps_path = args.runtime_deps_path
+    if (args.isolate_file_path and
+        not isolator.IsIsolateEmpty(args.isolate_file_path)):
+      if os.path.isabs(args.isolate_file_path):
+        self._isolate_abs_path = args.isolate_file_path
+      else:
+        self._isolate_abs_path = os.path.join(
+            constants.DIR_SOURCE_ROOT, args.isolate_file_path)
+      self._isolate_delegate = isolate_delegate
+      self._isolated_abs_path = os.path.join(
+          constants.GetOutDirectory(), '%s.isolated' % self._test_package)
+    else:
+      self._isolate_delegate = None
 
-    if not self._runtime_deps_path:
+    if not self._isolate_delegate:
       logging.warning('No data dependencies will be pushed.')
 
   def _initializeTestFilterAttributes(self, args):
     if args.test_filter:
       self._test_filter = _CMDLINE_NAME_SEGMENT_RE.sub(
           '', args.test_filter.replace('#', '.'))
 
     def annotation_element(a):
       a = a.split('=', 1)
       return (a[0], a[1] if len(a) == 2 else None)
@@ skipping 132 matching lines @@
   @property
   def timeout_scale(self):
     return self._timeout_scale
 
   #override
   def TestType(self):
     return 'instrumentation'
 
   #override
   def SetUp(self):
-    self._data_deps.extend(
-        self._data_deps_delegate(self._runtime_deps_path))
+    if self._isolate_delegate:
+      self._isolate_delegate.Remap(
+          self._isolate_abs_path, self._isolated_abs_path)
+      self._isolate_delegate.MoveOutputDeps()
+      self._data_deps.extend([(self._isolate_delegate.isolate_deps_dir, None)])
 
   def GetDataDependencies(self):
     return self._data_deps
 
   def GetTests(self):
     tests = GetAllTests(self.test_jar)
     inflated_tests = self._ParametrizeTestsWithFlags(self._InflateTests(tests))
     filtered_tests = FilterTests(
         inflated_tests, self._test_filter, self._annotations,
         self._excluded_annotations)
@@ skipping 51 matching lines @@
     return ParseAmInstrumentRawOutput(raw_output)
 
   @staticmethod
   def GenerateTestResults(
       result_code, result_bundle, statuses, start_ms, duration_ms):
     return GenerateTestResults(result_code, result_bundle, statuses,
                                start_ms, duration_ms)
 
   #override
   def TearDown(self):
-    pass
+    if self._isolate_delegate:
+      self._isolate_delegate.Clear()