| 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 sys | 8 import sys |
| 9 | 9 |
| 10 from pylib import cmd_helper | 10 from pylib import cmd_helper |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 def __init__(self, args, isolate_delegate, error_func): | 145 def __init__(self, args, isolate_delegate, error_func): |
| 146 super(InstrumentationTestInstance, self).__init__() | 146 super(InstrumentationTestInstance, self).__init__() |
| 147 | 147 |
| 148 self._apk_under_test = None | 148 self._apk_under_test = None |
| 149 self._package_info = None | 149 self._package_info = None |
| 150 self._test_apk = None | 150 self._test_apk = None |
| 151 self._test_jar = None | 151 self._test_jar = None |
| 152 self._test_package = None | 152 self._test_package = None |
| 153 self._test_runner = None | 153 self._test_runner = None |
| 154 self._test_support_apk = None | 154 self._test_support_apk = None |
| 155 self.__inititalizeApkAttributes(args, error_func) | 155 self.__initializeApkAttributes(args, error_func) |
| 156 | 156 |
| 157 self._data_deps = None | 157 self._data_deps = None |
| 158 self._isolate_abs_path = None | 158 self._isolate_abs_path = None |
| 159 self._isolate_delegate = None | 159 self._isolate_delegate = None |
| 160 self._isolated_abs_path = None | 160 self._isolated_abs_path = None |
| 161 self._test_data = None | 161 self._test_data = None |
| 162 self.__initializeDataDependencyAttributes(args, isolate_delegate) | 162 self.__initializeDataDependencyAttributes(args, isolate_delegate) |
| 163 | 163 |
| 164 self._annotations = None | 164 self._annotations = None |
| 165 self._excluded_annotations = None | 165 self._excluded_annotations = None |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 464 | 464 |
| 465 @staticmethod | 465 @staticmethod |
| 466 def GenerateTestResult(test_name, instr_statuses, start_ms, duration_ms): | 466 def GenerateTestResult(test_name, instr_statuses, start_ms, duration_ms): |
| 467 return GenerateTestResult(test_name, instr_statuses, start_ms, duration_ms) | 467 return GenerateTestResult(test_name, instr_statuses, start_ms, duration_ms) |
| 468 | 468 |
| 469 #override | 469 #override |
| 470 def TearDown(self): | 470 def TearDown(self): |
| 471 if self._isolate_delegate: | 471 if self._isolate_delegate: |
| 472 self._isolate_delegate.Clear() | 472 self._isolate_delegate.Clear() |
| 473 | 473 |
| OLD | NEW |