| 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 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 494 self._timeout_scale = None | 494 self._timeout_scale = None |
| 495 self._initializeTestControlAttributes(args) | 495 self._initializeTestControlAttributes(args) |
| 496 | 496 |
| 497 self._coverage_directory = None | 497 self._coverage_directory = None |
| 498 self._initializeTestCoverageAttributes(args) | 498 self._initializeTestCoverageAttributes(args) |
| 499 | 499 |
| 500 self._store_tombstones = False | 500 self._store_tombstones = False |
| 501 self._initializeTombstonesAttributes(args) | 501 self._initializeTombstonesAttributes(args) |
| 502 | 502 |
| 503 self._gs_results_bucket = None | 503 self._gs_results_bucket = None |
| 504 self._should_save_logcat = None | |
| 505 self._initializeLogAttributes(args) | 504 self._initializeLogAttributes(args) |
| 506 | 505 |
| 507 self._edit_shared_prefs = [] | 506 self._edit_shared_prefs = [] |
| 508 self._initializeEditPrefsAttributes(args) | 507 self._initializeEditPrefsAttributes(args) |
| 509 | 508 |
| 510 self._replace_system_package = None | 509 self._replace_system_package = None |
| 511 self._initializeReplaceSystemPackageAttributes(args) | 510 self._initializeReplaceSystemPackageAttributes(args) |
| 512 | 511 |
| 513 self._external_shard_index = args.test_launcher_shard_index | 512 self._external_shard_index = args.test_launcher_shard_index |
| 514 self._total_external_shards = args.test_launcher_total_shards | 513 self._total_external_shards = args.test_launcher_total_shards |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 675 self._ui_screenshot_dir = args.ui_screenshot_dir | 674 self._ui_screenshot_dir = args.ui_screenshot_dir |
| 676 | 675 |
| 677 def _initializeTestCoverageAttributes(self, args): | 676 def _initializeTestCoverageAttributes(self, args): |
| 678 self._coverage_directory = args.coverage_dir | 677 self._coverage_directory = args.coverage_dir |
| 679 | 678 |
| 680 def _initializeTombstonesAttributes(self, args): | 679 def _initializeTombstonesAttributes(self, args): |
| 681 self._store_tombstones = args.store_tombstones | 680 self._store_tombstones = args.store_tombstones |
| 682 | 681 |
| 683 def _initializeLogAttributes(self, args): | 682 def _initializeLogAttributes(self, args): |
| 684 self._gs_results_bucket = args.gs_results_bucket | 683 self._gs_results_bucket = args.gs_results_bucket |
| 685 self._should_save_logcat = bool(args.json_results_file) | |
| 686 | 684 |
| 687 def _initializeEditPrefsAttributes(self, args): | 685 def _initializeEditPrefsAttributes(self, args): |
| 688 if not hasattr(args, 'shared_prefs_file') or not args.shared_prefs_file: | 686 if not hasattr(args, 'shared_prefs_file') or not args.shared_prefs_file: |
| 689 return | 687 return |
| 690 if not isinstance(args.shared_prefs_file, str): | 688 if not isinstance(args.shared_prefs_file, str): |
| 691 logging.warning("Given non-string for a filepath") | 689 logging.warning("Given non-string for a filepath") |
| 692 return | 690 return |
| 693 self._edit_shared_prefs = shared_preference_utils.ExtractSettingsFromJson( | 691 self._edit_shared_prefs = shared_preference_utils.ExtractSettingsFromJson( |
| 694 args.shared_prefs_file) | 692 args.shared_prefs_file) |
| 695 | 693 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 737 | 735 |
| 738 @property | 736 @property |
| 739 def flags(self): | 737 def flags(self): |
| 740 return self._flags | 738 return self._flags |
| 741 | 739 |
| 742 @property | 740 @property |
| 743 def gs_results_bucket(self): | 741 def gs_results_bucket(self): |
| 744 return self._gs_results_bucket | 742 return self._gs_results_bucket |
| 745 | 743 |
| 746 @property | 744 @property |
| 747 def should_save_logcat(self): | |
| 748 return self._should_save_logcat | |
| 749 | |
| 750 @property | |
| 751 def package_info(self): | 745 def package_info(self): |
| 752 return self._package_info | 746 return self._package_info |
| 753 | 747 |
| 754 @property | 748 @property |
| 755 def render_results_dir(self): | 749 def render_results_dir(self): |
| 756 return self._render_results_dir | 750 return self._render_results_dir |
| 757 | 751 |
| 758 @property | 752 @property |
| 759 def replace_system_package(self): | 753 def replace_system_package(self): |
| 760 return self._replace_system_package | 754 return self._replace_system_package |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 891 | 885 |
| 892 @staticmethod | 886 @staticmethod |
| 893 def GenerateTestResults( | 887 def GenerateTestResults( |
| 894 result_code, result_bundle, statuses, start_ms, duration_ms): | 888 result_code, result_bundle, statuses, start_ms, duration_ms): |
| 895 return GenerateTestResults(result_code, result_bundle, statuses, | 889 return GenerateTestResults(result_code, result_bundle, statuses, |
| 896 start_ms, duration_ms) | 890 start_ms, duration_ms) |
| 897 | 891 |
| 898 #override | 892 #override |
| 899 def TearDown(self): | 893 def TearDown(self): |
| 900 pass | 894 pass |
| OLD | NEW |