| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import logging | 5 import logging |
| 6 import os | 6 import os |
| 7 import pickle | 7 import pickle |
| 8 import re | 8 import re |
| 9 import sys | 9 import sys |
| 10 | 10 |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 error_func('Unable to find test JAR: %s' % self._test_jar) | 204 error_func('Unable to find test JAR: %s' % self._test_jar) |
| 205 | 205 |
| 206 self._test_package = apk_helper.GetPackageName(self.test_apk) | 206 self._test_package = apk_helper.GetPackageName(self.test_apk) |
| 207 self._test_runner = apk_helper.GetInstrumentationName(self.test_apk) | 207 self._test_runner = apk_helper.GetInstrumentationName(self.test_apk) |
| 208 | 208 |
| 209 self._package_info = None | 209 self._package_info = None |
| 210 for package_info in constants.PACKAGE_INFO.itervalues(): | 210 for package_info in constants.PACKAGE_INFO.itervalues(): |
| 211 if self._test_package == package_info.test_package: | 211 if self._test_package == package_info.test_package: |
| 212 self._package_info = package_info | 212 self._package_info = package_info |
| 213 if not self._package_info: | 213 if not self._package_info: |
| 214 error_func('Unable to find package info for %s' % self._test_package) | 214 logging.warning('Unable to find package info for %s', self._test_package) |
| 215 | 215 |
| 216 def __initializeDataDependencyAttributes(self, args, isolate_delegate): | 216 def __initializeDataDependencyAttributes(self, args, isolate_delegate): |
| 217 self._data_deps = [] | 217 self._data_deps = [] |
| 218 if args.isolate_file_path: | 218 if args.isolate_file_path: |
| 219 self._isolate_abs_path = os.path.abspath(args.isolate_file_path) | 219 self._isolate_abs_path = os.path.abspath(args.isolate_file_path) |
| 220 self._isolate_delegate = isolate_delegate | 220 self._isolate_delegate = isolate_delegate |
| 221 self._isolated_abs_path = os.path.join( | 221 self._isolated_abs_path = os.path.join( |
| 222 constants.GetOutDirectory(), '%s.isolated' % self._test_package) | 222 constants.GetOutDirectory(), '%s.isolated' % self._test_package) |
| 223 else: | 223 else: |
| 224 self._isolate_delegate = None | 224 self._isolate_delegate = None |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 497 | 497 |
| 498 @staticmethod | 498 @staticmethod |
| 499 def GenerateTestResult(test_name, instr_statuses, start_ms, duration_ms): | 499 def GenerateTestResult(test_name, instr_statuses, start_ms, duration_ms): |
| 500 return GenerateTestResult(test_name, instr_statuses, start_ms, duration_ms) | 500 return GenerateTestResult(test_name, instr_statuses, start_ms, duration_ms) |
| 501 | 501 |
| 502 #override | 502 #override |
| 503 def TearDown(self): | 503 def TearDown(self): |
| 504 if self._isolate_delegate: | 504 if self._isolate_delegate: |
| 505 self._isolate_delegate.Clear() | 505 self._isolate_delegate.Clear() |
| 506 | 506 |
| OLD | NEW |