| 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 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 if hasattr(args, 'device_flags') and args.device_flags: | 263 if hasattr(args, 'device_flags') and args.device_flags: |
| 264 with open(args.device_flags) as device_flags_file: | 264 with open(args.device_flags) as device_flags_file: |
| 265 stripped_lines = (l.strip() for l in device_flags_file) | 265 stripped_lines = (l.strip() for l in device_flags_file) |
| 266 self._flags.extend([flag for flag in stripped_lines if flag]) | 266 self._flags.extend([flag for flag in stripped_lines if flag]) |
| 267 if hasattr(args, 'device_flags_file') and args.device_flags_file: | 267 if hasattr(args, 'device_flags_file') and args.device_flags_file: |
| 268 with open(args.device_flags_file) as device_flags_file: | 268 with open(args.device_flags_file) as device_flags_file: |
| 269 stripped_lines = (l.strip() for l in device_flags_file) | 269 stripped_lines = (l.strip() for l in device_flags_file) |
| 270 self._flags.extend([flag for flag in stripped_lines if flag]) | 270 self._flags.extend([flag for flag in stripped_lines if flag]) |
| 271 | 271 |
| 272 @property | 272 @property |
| 273 def suite(self): |
| 274 return 'instrumentation' |
| 275 |
| 276 @property |
| 273 def apk_under_test(self): | 277 def apk_under_test(self): |
| 274 return self._apk_under_test | 278 return self._apk_under_test |
| 275 | 279 |
| 276 @property | 280 @property |
| 277 def flags(self): | 281 def flags(self): |
| 278 return self._flags | 282 return self._flags |
| 279 | 283 |
| 280 @property | 284 @property |
| 281 def package_info(self): | 285 def package_info(self): |
| 282 return self._package_info | 286 return self._package_info |
| (...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 464 | 468 |
| 465 @staticmethod | 469 @staticmethod |
| 466 def GenerateTestResult(test_name, instr_statuses, start_ms, duration_ms): | 470 def GenerateTestResult(test_name, instr_statuses, start_ms, duration_ms): |
| 467 return GenerateTestResult(test_name, instr_statuses, start_ms, duration_ms) | 471 return GenerateTestResult(test_name, instr_statuses, start_ms, duration_ms) |
| 468 | 472 |
| 469 #override | 473 #override |
| 470 def TearDown(self): | 474 def TearDown(self): |
| 471 if self._isolate_delegate: | 475 if self._isolate_delegate: |
| 472 self._isolate_delegate.Clear() | 476 self._isolate_delegate.Clear() |
| 473 | 477 |
| OLD | NEW |