| 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 copy | 5 import copy |
| 6 import logging | 6 import logging |
| 7 import os | 7 import os |
| 8 import pickle | 8 import pickle |
| 9 import re | 9 import re |
| 10 | 10 |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 481 self._initializeTestControlAttributes(args) | 481 self._initializeTestControlAttributes(args) |
| 482 | 482 |
| 483 self._coverage_directory = None | 483 self._coverage_directory = None |
| 484 self._initializeTestCoverageAttributes(args) | 484 self._initializeTestCoverageAttributes(args) |
| 485 | 485 |
| 486 self._store_tombstones = False | 486 self._store_tombstones = False |
| 487 self._symbolizer = None | 487 self._symbolizer = None |
| 488 self._initializeTombstonesAttributes(args) | 488 self._initializeTombstonesAttributes(args) |
| 489 | 489 |
| 490 self._gs_results_bucket = None | 490 self._gs_results_bucket = None |
| 491 self._should_save_logcat = None | |
| 492 self._initializeLogAttributes(args) | 491 self._initializeLogAttributes(args) |
| 493 | 492 |
| 494 self._edit_shared_prefs = [] | 493 self._edit_shared_prefs = [] |
| 495 self._initializeEditPrefsAttributes(args) | 494 self._initializeEditPrefsAttributes(args) |
| 496 | 495 |
| 497 self._replace_system_package = None | 496 self._replace_system_package = None |
| 498 self._initializeReplaceSystemPackageAttributes(args) | 497 self._initializeReplaceSystemPackageAttributes(args) |
| 499 | 498 |
| 500 self._external_shard_index = args.test_launcher_shard_index | 499 self._external_shard_index = args.test_launcher_shard_index |
| 501 self._total_external_shards = args.test_launcher_total_shards | 500 self._total_external_shards = args.test_launcher_total_shards |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 667 self._coverage_directory = args.coverage_dir | 666 self._coverage_directory = args.coverage_dir |
| 668 | 667 |
| 669 def _initializeTombstonesAttributes(self, args): | 668 def _initializeTombstonesAttributes(self, args): |
| 670 self._store_tombstones = args.store_tombstones | 669 self._store_tombstones = args.store_tombstones |
| 671 self._symbolizer = stack_symbolizer.Symbolizer( | 670 self._symbolizer = stack_symbolizer.Symbolizer( |
| 672 self.apk_under_test.path if self.apk_under_test else None, | 671 self.apk_under_test.path if self.apk_under_test else None, |
| 673 args.enable_relocation_packing) | 672 args.enable_relocation_packing) |
| 674 | 673 |
| 675 def _initializeLogAttributes(self, args): | 674 def _initializeLogAttributes(self, args): |
| 676 self._gs_results_bucket = args.gs_results_bucket | 675 self._gs_results_bucket = args.gs_results_bucket |
| 677 self._should_save_logcat = bool(args.json_results_file) | |
| 678 | 676 |
| 679 def _initializeEditPrefsAttributes(self, args): | 677 def _initializeEditPrefsAttributes(self, args): |
| 680 if not hasattr(args, 'shared_prefs_file') or not args.shared_prefs_file: | 678 if not hasattr(args, 'shared_prefs_file') or not args.shared_prefs_file: |
| 681 return | 679 return |
| 682 if not isinstance(args.shared_prefs_file, str): | 680 if not isinstance(args.shared_prefs_file, str): |
| 683 logging.warning("Given non-string for a filepath") | 681 logging.warning("Given non-string for a filepath") |
| 684 return | 682 return |
| 685 self._edit_shared_prefs = shared_preference_utils.ExtractSettingsFromJson( | 683 self._edit_shared_prefs = shared_preference_utils.ExtractSettingsFromJson( |
| 686 args.shared_prefs_file) | 684 args.shared_prefs_file) |
| 687 | 685 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 737 | 735 |
| 738 @property | 736 @property |
| 739 def junit3_runner_class(self): | 737 def junit3_runner_class(self): |
| 740 return self._junit3_runner_class | 738 return self._junit3_runner_class |
| 741 | 739 |
| 742 @property | 740 @property |
| 743 def junit4_runner_class(self): | 741 def junit4_runner_class(self): |
| 744 return self._junit4_runner_class | 742 return self._junit4_runner_class |
| 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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 895 | 889 |
| 896 @staticmethod | 890 @staticmethod |
| 897 def GenerateTestResults( | 891 def GenerateTestResults( |
| 898 result_code, result_bundle, statuses, start_ms, duration_ms): | 892 result_code, result_bundle, statuses, start_ms, duration_ms): |
| 899 return GenerateTestResults(result_code, result_bundle, statuses, | 893 return GenerateTestResults(result_code, result_bundle, statuses, |
| 900 start_ms, duration_ms) | 894 start_ms, duration_ms) |
| 901 | 895 |
| 902 #override | 896 #override |
| 903 def TearDown(self): | 897 def TearDown(self): |
| 904 self.symbolizer.CleanUp() | 898 self.symbolizer.CleanUp() |
| OLD | NEW |