Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1179)

Side by Side Diff: build/android/buildbot/bb_device_steps.py

Issue 988393002: [Android] Pass --disable-location to provision_devices on ChromeDriver bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import collections 6 import collections
7 import glob 7 import glob
8 import hashlib 8 import hashlib
9 import json 9 import json
10 import os 10 import os
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 459
460 if not bb_utils.TESTING: 460 if not bb_utils.TESTING:
461 # Restart adb to work around bugs, sleep to wait for usb discovery. 461 # Restart adb to work around bugs, sleep to wait for usb discovery.
462 device_utils.RestartServer() 462 device_utils.RestartServer()
463 RunCmd(['sleep', '1']) 463 RunCmd(['sleep', '1'])
464 provision_cmd = ['build/android/provision_devices.py', '-t', options.target] 464 provision_cmd = ['build/android/provision_devices.py', '-t', options.target]
465 if options.auto_reconnect: 465 if options.auto_reconnect:
466 provision_cmd.append('--auto-reconnect') 466 provision_cmd.append('--auto-reconnect')
467 if options.skip_wipe: 467 if options.skip_wipe:
468 provision_cmd.append('--skip-wipe') 468 provision_cmd.append('--skip-wipe')
469 if options.disable_location:
470 provision_cmd.append('--disable-location')
469 RunCmd(provision_cmd, halt_on_failure=True) 471 RunCmd(provision_cmd, halt_on_failure=True)
470 472
471 473
472 def DeviceStatusCheck(options): 474 def DeviceStatusCheck(options):
473 bb_annotations.PrintNamedStep('device_status_check') 475 bb_annotations.PrintNamedStep('device_status_check')
474 cmd = ['build/android/buildbot/bb_device_status_check.py'] 476 cmd = ['build/android/buildbot/bb_device_status_check.py']
475 if options.restart_usb: 477 if options.restart_usb:
476 cmd.append('--restart-usb') 478 cmd.append('--restart-usb')
477 RunCmd(cmd, halt_on_failure=True) 479 RunCmd(cmd, halt_on_failure=True)
478 480
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 help='Restart usb ports before device status check.') 708 help='Restart usb ports before device status check.')
707 parser.add_option( 709 parser.add_option(
708 '--flakiness-server', 710 '--flakiness-server',
709 help=('The flakiness dashboard server to which the results should be ' 711 help=('The flakiness dashboard server to which the results should be '
710 'uploaded.')) 712 'uploaded.'))
711 parser.add_option( 713 parser.add_option(
712 '--auto-reconnect', action='store_true', 714 '--auto-reconnect', action='store_true',
713 help='Push script to device which restarts adbd on disconnections.') 715 help='Push script to device which restarts adbd on disconnections.')
714 parser.add_option('--skip-wipe', action='store_true', 716 parser.add_option('--skip-wipe', action='store_true',
715 help='Do not wipe devices during provisioning.') 717 help='Do not wipe devices during provisioning.')
718 parser.add_option('--disable-location', action='store_true',
719 help='Disable location settings.')
716 parser.add_option( 720 parser.add_option(
717 '--logcat-dump-output', 721 '--logcat-dump-output',
718 help='The logcat dump output will be "tee"-ed into this file') 722 help='The logcat dump output will be "tee"-ed into this file')
719 # During processing perf bisects, a seperate working directory created under 723 # During processing perf bisects, a seperate working directory created under
720 # which builds are produced. Therefore we should look for relevent output 724 # which builds are produced. Therefore we should look for relevent output
721 # file under this directory.(/b/build/slave/<slave_name>/build/bisect/src/out) 725 # file under this directory.(/b/build/slave/<slave_name>/build/bisect/src/out)
722 parser.add_option( 726 parser.add_option(
723 '--chrome-output-dir', 727 '--chrome-output-dir',
724 help='Chrome output directory to be used while bisecting.') 728 help='Chrome output directory to be used while bisecting.')
725 729
(...skipping 27 matching lines...) Expand all
753 757
754 if options.coverage_bucket: 758 if options.coverage_bucket:
755 setattr(options, 'coverage_dir', 759 setattr(options, 'coverage_dir',
756 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) 760 os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
757 761
758 MainTestWrapper(options) 762 MainTestWrapper(options)
759 763
760 764
761 if __name__ == '__main__': 765 if __name__ == '__main__':
762 sys.exit(main(sys.argv)) 766 sys.exit(main(sys.argv))
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698