[Android] Switch instrumentation tests to platform mode. (RELAND 2)

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
@@ skipping 212 matching lines @@
 
     self._driver_apk = None
     self._driver_package = None
     self._driver_name = None
     self._initializeDriverAttributes()
 
     self._timeout_scale = None
     self._initializeTestControlAttributes(args)
 
   def _initializeApkAttributes(self, args, error_func):
-    apk_under_test_path = args.apk_under_test
-    if not args.apk_under_test.endswith('.apk'):
-      apk_under_test_path = os.path.join(
-          constants.GetOutDirectory(), constants.SDK_BUILD_APKS_DIR,
-          '%s.apk' % args.apk_under_test)
+    if args.apk_under_test:
+      apk_under_test_path = args.apk_under_test
+      if not args.apk_under_test.endswith('.apk'):
+        apk_under_test_path = os.path.join(
+            constants.GetOutDirectory(), constants.SDK_BUILD_APKS_DIR,
+            '%s.apk' % args.apk_under_test)
 
-    if not os.path.exists(apk_under_test_path):
-      error_func('Unable to find APK under test: %s' % apk_under_test_path)
+      if not os.path.exists(apk_under_test_path):
+        error_func('Unable to find APK under test: %s' % apk_under_test_path)
 
-    self._apk_under_test = apk_helper.ToHelper(apk_under_test_path)
+      self._apk_under_test = apk_helper.ToHelper(apk_under_test_path)
 
     if args.test_apk.endswith('.apk'):
       self._suite = os.path.splitext(os.path.basename(args.test_apk))[0]
       self._test_apk = apk_helper.ToHelper(args.test_apk)
     else:
       self._suite = args.test_apk
       self._test_apk = apk_helper.ToHelper(os.path.join(
           constants.GetOutDirectory(), constants.SDK_BUILD_APKS_DIR,
           '%s.apk' % args.test_apk))
 
@@ skipping 30 matching lines @@
 
     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, isolate_delegate):
     self._data_deps = []
     if args.isolate_file_path:
-      self._isolate_abs_path = os.path.abspath(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
 
     # TODO(jbudorick): Deprecate and remove --test-data once data dependencies
     # are fully converted to isolate.
     if args.test_data:
       logging.info('Data dependencies specified via --test-data')
       self._test_data = args.test_data
     else:
       self._test_data = None
 
     if not self._isolate_delegate and not self._test_data:
       logging.warning('No data dependencies will be pushed.')
 
   def _initializeTestFilterAttributes(self, args):
-    self._test_filter = args.test_filter
+    if args.test_filter:
+      self._test_filter = args.test_filter.replace('#', '.')
 
     def annotation_dict_element(a):
       a = a.split('=')
       return (a[0], a[1] if len(a) == 2 else None)
 
     if args.annotation_str:
       self._annotations = dict(
           annotation_dict_element(a)
           for a in args.annotation_str.split(','))
     elif not self._test_filter:
@@ skipping 10 matching lines @@
     else:
       self._excluded_annotations = {}
 
     self._excluded_annotations.update(
         {
           a: None for a in _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS
           if a not in self._annotations
         })
 
   def _initializeFlagAttributes(self, args):
-    self._flags = ['--disable-fre', '--enable-test-intents']
+    self._flags = ['--enable-test-intents']
     # TODO(jbudorick): Transition "--device-flags" to "--device-flags-file"
     if hasattr(args, 'device_flags') and args.device_flags:
       with open(args.device_flags) as device_flags_file:
         stripped_lines = (l.strip() for l in device_flags_file)
         self._flags.extend([flag for flag in stripped_lines if flag])
     if hasattr(args, 'device_flags_file') and args.device_flags_file:
       with open(args.device_flags_file) as device_flags_file:
         stripped_lines = (l.strip() for l in device_flags_file)
         self._flags.extend([flag for flag in stripped_lines if flag])
     if (hasattr(args, 'strict_mode') and
@@ skipping 275 matching lines @@
   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):
     if self._isolate_delegate:
       self._isolate_delegate.Clear()