| 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 collections | 5 import collections |
| 6 import copy | 6 import copy |
| 7 import logging | 7 import logging |
| 8 import os | 8 import os |
| 9 import pickle | 9 import pickle |
| 10 import re | 10 import re |
| (...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 542 else: | 542 else: |
| 543 self._annotations = [] | 543 self._annotations = [] |
| 544 | 544 |
| 545 if args.exclude_annotation_str: | 545 if args.exclude_annotation_str: |
| 546 self._excluded_annotations = [ | 546 self._excluded_annotations = [ |
| 547 annotation_element(a) for a in args.exclude_annotation_str.split(',')] | 547 annotation_element(a) for a in args.exclude_annotation_str.split(',')] |
| 548 else: | 548 else: |
| 549 self._excluded_annotations = [] | 549 self._excluded_annotations = [] |
| 550 | 550 |
| 551 requested_annotations = set(a[0] for a in self._annotations) | 551 requested_annotations = set(a[0] for a in self._annotations) |
| 552 self._excluded_annotations.extend( | 552 if not args.run_disabled: |
| 553 annotation_element(a) for a in _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS | 553 self._excluded_annotations.extend( |
| 554 if a not in requested_annotations) | 554 annotation_element(a) for a in _EXCLUDE_UNLESS_REQUESTED_ANNOTATIONS |
| 555 if a not in requested_annotations) |
| 555 | 556 |
| 556 def _initializeFlagAttributes(self, args): | 557 def _initializeFlagAttributes(self, args): |
| 557 self._flags = ['--enable-test-intents'] | 558 self._flags = ['--enable-test-intents'] |
| 558 # TODO(jbudorick): Transition "--device-flags" to "--device-flags-file" | 559 # TODO(jbudorick): Transition "--device-flags" to "--device-flags-file" |
| 559 if hasattr(args, 'device_flags') and args.device_flags: | 560 if hasattr(args, 'device_flags') and args.device_flags: |
| 560 with open(args.device_flags) as device_flags_file: | 561 with open(args.device_flags) as device_flags_file: |
| 561 stripped_lines = (l.strip() for l in device_flags_file) | 562 stripped_lines = (l.strip() for l in device_flags_file) |
| 562 self._flags.extend([flag for flag in stripped_lines if flag]) | 563 self._flags.extend([flag for flag in stripped_lines if flag]) |
| 563 if hasattr(args, 'device_flags_file') and args.device_flags_file: | 564 if hasattr(args, 'device_flags_file') and args.device_flags_file: |
| 564 with open(args.device_flags_file) as device_flags_file: | 565 with open(args.device_flags_file) as device_flags_file: |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 741 | 742 |
| 742 @staticmethod | 743 @staticmethod |
| 743 def GenerateTestResults( | 744 def GenerateTestResults( |
| 744 result_code, result_bundle, statuses, start_ms, duration_ms): | 745 result_code, result_bundle, statuses, start_ms, duration_ms): |
| 745 return GenerateTestResults(result_code, result_bundle, statuses, | 746 return GenerateTestResults(result_code, result_bundle, statuses, |
| 746 start_ms, duration_ms) | 747 start_ms, duration_ms) |
| 747 | 748 |
| 748 #override | 749 #override |
| 749 def TearDown(self): | 750 def TearDown(self): |
| 750 pass | 751 pass |
| OLD | NEW |