| 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 self._flags.extend(args.command_line_flags) | 646 self._flags.extend(args.command_line_flags) |
| 647 if args.device_flags_file: | 647 if args.device_flags_file: |
| 648 with open(args.device_flags_file) as device_flags_file: | 648 with open(args.device_flags_file) as device_flags_file: |
| 649 stripped_lines = (l.strip() for l in device_flags_file) | 649 stripped_lines = (l.strip() for l in device_flags_file) |
| 650 self._flags.extend(flag for flag in stripped_lines if flag) | 650 self._flags.extend(flag for flag in stripped_lines if flag) |
| 651 if args.strict_mode and args.strict_mode != 'off': | 651 if args.strict_mode and args.strict_mode != 'off': |
| 652 self._flags.append('--strict-mode=' + args.strict_mode) | 652 self._flags.append('--strict-mode=' + args.strict_mode) |
| 653 if args.regenerate_goldens: | 653 if args.regenerate_goldens: |
| 654 self._flags.append('--regenerate-goldens') | 654 self._flags.append('--regenerate-goldens') |
| 655 | 655 |
| 656 if args.test_arguments: | |
| 657 # --test-arguments is deprecated for gtests and is in the process of | |
| 658 # being removed. | |
| 659 raise Exception( | |
| 660 '--test-arguments is not supported for instrumentation ' | |
| 661 'tests. Pass command-line flags directly instead.') | |
| 662 | |
| 663 def _initializeDriverAttributes(self): | 656 def _initializeDriverAttributes(self): |
| 664 self._driver_apk = os.path.join( | 657 self._driver_apk = os.path.join( |
| 665 constants.GetOutDirectory(), constants.SDK_BUILD_APKS_DIR, | 658 constants.GetOutDirectory(), constants.SDK_BUILD_APKS_DIR, |
| 666 'OnDeviceInstrumentationDriver.apk') | 659 'OnDeviceInstrumentationDriver.apk') |
| 667 if os.path.exists(self._driver_apk): | 660 if os.path.exists(self._driver_apk): |
| 668 driver_apk = apk_helper.ApkHelper(self._driver_apk) | 661 driver_apk = apk_helper.ApkHelper(self._driver_apk) |
| 669 self._driver_package = driver_apk.GetPackageName() | 662 self._driver_package = driver_apk.GetPackageName() |
| 670 self._driver_name = driver_apk.GetInstrumentationName() | 663 self._driver_name = driver_apk.GetInstrumentationName() |
| 671 else: | 664 else: |
| 672 self._driver_apk = None | 665 self._driver_apk = None |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 882 | 875 |
| 883 @staticmethod | 876 @staticmethod |
| 884 def GenerateTestResults( | 877 def GenerateTestResults( |
| 885 result_code, result_bundle, statuses, start_ms, duration_ms): | 878 result_code, result_bundle, statuses, start_ms, duration_ms): |
| 886 return GenerateTestResults(result_code, result_bundle, statuses, | 879 return GenerateTestResults(result_code, result_bundle, statuses, |
| 887 start_ms, duration_ms) | 880 start_ms, duration_ms) |
| 888 | 881 |
| 889 #override | 882 #override |
| 890 def TearDown(self): | 883 def TearDown(self): |
| 891 pass | 884 pass |
| OLD | NEW |