| 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 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 646 def _initializeFlagAttributes(self, args): | 646 def _initializeFlagAttributes(self, args): |
| 647 self._flags = ['--enable-test-intents'] | 647 self._flags = ['--enable-test-intents'] |
| 648 if args.command_line_flags: | 648 if args.command_line_flags: |
| 649 self._flags.extend(args.command_line_flags) | 649 self._flags.extend(args.command_line_flags) |
| 650 if args.device_flags_file: | 650 if args.device_flags_file: |
| 651 with open(args.device_flags_file) as device_flags_file: | 651 with open(args.device_flags_file) as device_flags_file: |
| 652 stripped_lines = (l.strip() for l in device_flags_file) | 652 stripped_lines = (l.strip() for l in device_flags_file) |
| 653 self._flags.extend(flag for flag in stripped_lines if flag) | 653 self._flags.extend(flag for flag in stripped_lines if flag) |
| 654 if args.strict_mode and args.strict_mode != 'off': | 654 if args.strict_mode and args.strict_mode != 'off': |
| 655 self._flags.append('--strict-mode=' + args.strict_mode) | 655 self._flags.append('--strict-mode=' + args.strict_mode) |
| 656 if args.regenerate_goldens: | |
| 657 self._flags.append('--regenerate-goldens') | |
| 658 | 656 |
| 659 def _initializeDriverAttributes(self): | 657 def _initializeDriverAttributes(self): |
| 660 self._driver_apk = os.path.join( | 658 self._driver_apk = os.path.join( |
| 661 constants.GetOutDirectory(), constants.SDK_BUILD_APKS_DIR, | 659 constants.GetOutDirectory(), constants.SDK_BUILD_APKS_DIR, |
| 662 'OnDeviceInstrumentationDriver.apk') | 660 'OnDeviceInstrumentationDriver.apk') |
| 663 if os.path.exists(self._driver_apk): | 661 if os.path.exists(self._driver_apk): |
| 664 driver_apk = apk_helper.ApkHelper(self._driver_apk) | 662 driver_apk = apk_helper.ApkHelper(self._driver_apk) |
| 665 self._driver_package = driver_apk.GetPackageName() | 663 self._driver_package = driver_apk.GetPackageName() |
| 666 self._driver_name = driver_apk.GetInstrumentationName() | 664 self._driver_name = driver_apk.GetInstrumentationName() |
| 667 else: | 665 else: |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 893 | 891 |
| 894 @staticmethod | 892 @staticmethod |
| 895 def GenerateTestResults( | 893 def GenerateTestResults( |
| 896 result_code, result_bundle, statuses, start_ms, duration_ms): | 894 result_code, result_bundle, statuses, start_ms, duration_ms): |
| 897 return GenerateTestResults(result_code, result_bundle, statuses, | 895 return GenerateTestResults(result_code, result_bundle, statuses, |
| 898 start_ms, duration_ms) | 896 start_ms, duration_ms) |
| 899 | 897 |
| 900 #override | 898 #override |
| 901 def TearDown(self): | 899 def TearDown(self): |
| 902 pass | 900 pass |
| OLD | NEW |