| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 re | 7 import re |
| 8 import sys | 8 import sys |
| 9 import tempfile | 9 import tempfile |
| 10 | 10 |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 self._app_data_files = args.app_data_files | 190 self._app_data_files = args.app_data_files |
| 191 if args.app_data_file_dir: | 191 if args.app_data_file_dir: |
| 192 self._app_data_file_dir = args.app_data_file_dir | 192 self._app_data_file_dir = args.app_data_file_dir |
| 193 else: | 193 else: |
| 194 self._app_data_file_dir = tempfile.mkdtemp() | 194 self._app_data_file_dir = tempfile.mkdtemp() |
| 195 logging.critical('Saving app files to %s', self._app_data_file_dir) | 195 logging.critical('Saving app files to %s', self._app_data_file_dir) |
| 196 else: | 196 else: |
| 197 self._app_data_files = None | 197 self._app_data_files = None |
| 198 self._app_data_file_dir = None | 198 self._app_data_file_dir = None |
| 199 | 199 |
| 200 @property |
| 201 def gtest_filter(self): |
| 202 return self._gtest_filter |
| 203 |
| 200 #override | 204 #override |
| 201 def TestType(self): | 205 def TestType(self): |
| 202 return 'gtest' | 206 return 'gtest' |
| 203 | 207 |
| 204 #override | 208 #override |
| 205 def SetUp(self): | 209 def SetUp(self): |
| 206 """Map data dependencies via isolate.""" | 210 """Map data dependencies via isolate.""" |
| 207 if self._isolate_delegate: | 211 if self._isolate_delegate: |
| 208 self._isolate_delegate.Remap( | 212 self._isolate_delegate.Remap( |
| 209 self._isolate_abs_path, self._isolated_abs_path) | 213 self._isolate_abs_path, self._isolated_abs_path) |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 return self._apk_helper and self._apk_helper.GetInstrumentationName() | 354 return self._apk_helper and self._apk_helper.GetInstrumentationName() |
| 351 | 355 |
| 352 @property | 356 @property |
| 353 def shard_timeout(self): | 357 def shard_timeout(self): |
| 354 return self._shard_timeout | 358 return self._shard_timeout |
| 355 | 359 |
| 356 @property | 360 @property |
| 357 def suite(self): | 361 def suite(self): |
| 358 return self._suite | 362 return self._suite |
| 359 | 363 |
| OLD | NEW |