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 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
661 if os.path.exists(self._driver_apk): | 661 if os.path.exists(self._driver_apk): |
662 driver_apk = apk_helper.ApkHelper(self._driver_apk) | 662 driver_apk = apk_helper.ApkHelper(self._driver_apk) |
663 self._driver_package = driver_apk.GetPackageName() | 663 self._driver_package = driver_apk.GetPackageName() |
664 self._driver_name = driver_apk.GetInstrumentationName() | 664 self._driver_name = driver_apk.GetInstrumentationName() |
665 else: | 665 else: |
666 self._driver_apk = None | 666 self._driver_apk = None |
667 | 667 |
668 def _initializeTestControlAttributes(self, args): | 668 def _initializeTestControlAttributes(self, args): |
669 self._screenshot_dir = args.screenshot_dir | 669 self._screenshot_dir = args.screenshot_dir |
670 self._timeout_scale = args.timeout_scale or 1 | 670 self._timeout_scale = args.timeout_scale or 1 |
| 671 self._ui_screenshot_dir = args.ui_screenshot_dir |
671 | 672 |
672 def _initializeTestCoverageAttributes(self, args): | 673 def _initializeTestCoverageAttributes(self, args): |
673 self._coverage_directory = args.coverage_dir | 674 self._coverage_directory = args.coverage_dir |
674 | 675 |
675 def _initializeTombstonesAttributes(self, args): | 676 def _initializeTombstonesAttributes(self, args): |
676 self._store_tombstones = args.store_tombstones | 677 self._store_tombstones = args.store_tombstones |
677 | 678 |
678 def _initializeLogAttributes(self, args): | 679 def _initializeLogAttributes(self, args): |
679 self._gs_results_bucket = args.gs_results_bucket | 680 self._gs_results_bucket = args.gs_results_bucket |
680 self._should_save_logcat = bool(args.json_results_file) | 681 self._should_save_logcat = bool(args.json_results_file) |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
794 return self._test_runner_junit4 | 795 return self._test_runner_junit4 |
795 | 796 |
796 @property | 797 @property |
797 def timeout_scale(self): | 798 def timeout_scale(self): |
798 return self._timeout_scale | 799 return self._timeout_scale |
799 | 800 |
800 @property | 801 @property |
801 def total_external_shards(self): | 802 def total_external_shards(self): |
802 return self._total_external_shards | 803 return self._total_external_shards |
803 | 804 |
| 805 @property |
| 806 def ui_screenshot_dir(self): |
| 807 return self._ui_screenshot_dir |
| 808 |
804 #override | 809 #override |
805 def TestType(self): | 810 def TestType(self): |
806 return 'instrumentation' | 811 return 'instrumentation' |
807 | 812 |
808 #override | 813 #override |
809 def SetUp(self): | 814 def SetUp(self): |
810 self._data_deps.extend( | 815 self._data_deps.extend( |
811 self._data_deps_delegate(self._runtime_deps_path)) | 816 self._data_deps_delegate(self._runtime_deps_path)) |
812 | 817 |
813 def GetDataDependencies(self): | 818 def GetDataDependencies(self): |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
881 | 886 |
882 @staticmethod | 887 @staticmethod |
883 def GenerateTestResults( | 888 def GenerateTestResults( |
884 result_code, result_bundle, statuses, start_ms, duration_ms): | 889 result_code, result_bundle, statuses, start_ms, duration_ms): |
885 return GenerateTestResults(result_code, result_bundle, statuses, | 890 return GenerateTestResults(result_code, result_bundle, statuses, |
886 start_ms, duration_ms) | 891 start_ms, duration_ms) |
887 | 892 |
888 #override | 893 #override |
889 def TearDown(self): | 894 def TearDown(self): |
890 pass | 895 pass |
OLD | NEW |