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 json | 7 import json |
8 import logging | 8 import logging |
9 import os | 9 import os |
10 import pickle | 10 import pickle |
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
482 self._initializeTestFilterAttributes(args) | 482 self._initializeTestFilterAttributes(args) |
483 | 483 |
484 self._flags = None | 484 self._flags = None |
485 self._initializeFlagAttributes(args) | 485 self._initializeFlagAttributes(args) |
486 | 486 |
487 self._driver_apk = None | 487 self._driver_apk = None |
488 self._driver_package = None | 488 self._driver_package = None |
489 self._driver_name = None | 489 self._driver_name = None |
490 self._initializeDriverAttributes() | 490 self._initializeDriverAttributes() |
491 | 491 |
| 492 self._render_results_dir = None |
| 493 self._screenshot_dir = None |
492 self._timeout_scale = None | 494 self._timeout_scale = None |
493 self._initializeTestControlAttributes(args) | 495 self._initializeTestControlAttributes(args) |
494 | 496 |
495 self._coverage_directory = None | 497 self._coverage_directory = None |
496 self._initializeTestCoverageAttributes(args) | 498 self._initializeTestCoverageAttributes(args) |
497 | 499 |
498 self._store_tombstones = False | 500 self._store_tombstones = False |
499 self._initializeTombstonesAttributes(args) | 501 self._initializeTombstonesAttributes(args) |
500 | 502 |
501 self._gs_results_bucket = None | 503 self._gs_results_bucket = None |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
659 constants.GetOutDirectory(), constants.SDK_BUILD_APKS_DIR, | 661 constants.GetOutDirectory(), constants.SDK_BUILD_APKS_DIR, |
660 'OnDeviceInstrumentationDriver.apk') | 662 'OnDeviceInstrumentationDriver.apk') |
661 if os.path.exists(self._driver_apk): | 663 if os.path.exists(self._driver_apk): |
662 driver_apk = apk_helper.ApkHelper(self._driver_apk) | 664 driver_apk = apk_helper.ApkHelper(self._driver_apk) |
663 self._driver_package = driver_apk.GetPackageName() | 665 self._driver_package = driver_apk.GetPackageName() |
664 self._driver_name = driver_apk.GetInstrumentationName() | 666 self._driver_name = driver_apk.GetInstrumentationName() |
665 else: | 667 else: |
666 self._driver_apk = None | 668 self._driver_apk = None |
667 | 669 |
668 def _initializeTestControlAttributes(self, args): | 670 def _initializeTestControlAttributes(self, args): |
| 671 self._render_results_dir = args.render_results_dir |
669 self._screenshot_dir = args.screenshot_dir | 672 self._screenshot_dir = args.screenshot_dir |
670 self._timeout_scale = args.timeout_scale or 1 | 673 self._timeout_scale = args.timeout_scale or 1 |
671 | 674 |
672 def _initializeTestCoverageAttributes(self, args): | 675 def _initializeTestCoverageAttributes(self, args): |
673 self._coverage_directory = args.coverage_dir | 676 self._coverage_directory = args.coverage_dir |
674 | 677 |
675 def _initializeTombstonesAttributes(self, args): | 678 def _initializeTombstonesAttributes(self, args): |
676 self._store_tombstones = args.store_tombstones | 679 self._store_tombstones = args.store_tombstones |
677 | 680 |
678 def _initializeLogAttributes(self, args): | 681 def _initializeLogAttributes(self, args): |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
747 | 750 |
748 @property | 751 @property |
749 def should_save_logcat(self): | 752 def should_save_logcat(self): |
750 return self._should_save_logcat | 753 return self._should_save_logcat |
751 | 754 |
752 @property | 755 @property |
753 def package_info(self): | 756 def package_info(self): |
754 return self._package_info | 757 return self._package_info |
755 | 758 |
756 @property | 759 @property |
| 760 def render_results_dir(self): |
| 761 return self._render_results_dir |
| 762 |
| 763 @property |
757 def screenshot_dir(self): | 764 def screenshot_dir(self): |
758 return self._screenshot_dir | 765 return self._screenshot_dir |
759 | 766 |
760 @property | 767 @property |
761 def store_tombstones(self): | 768 def store_tombstones(self): |
762 return self._store_tombstones | 769 return self._store_tombstones |
763 | 770 |
764 @property | 771 @property |
765 def suite(self): | 772 def suite(self): |
766 return self._suite | 773 return self._suite |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
881 | 888 |
882 @staticmethod | 889 @staticmethod |
883 def GenerateTestResults( | 890 def GenerateTestResults( |
884 result_code, result_bundle, statuses, start_ms, duration_ms): | 891 result_code, result_bundle, statuses, start_ms, duration_ms): |
885 return GenerateTestResults(result_code, result_bundle, statuses, | 892 return GenerateTestResults(result_code, result_bundle, statuses, |
886 start_ms, duration_ms) | 893 start_ms, duration_ms) |
887 | 894 |
888 #override | 895 #override |
889 def TearDown(self): | 896 def TearDown(self): |
890 pass | 897 pass |
OLD | NEW |