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

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

Issue 390993003: Make provision_devices failures abort the build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 407
408 if not bb_utils.TESTING: 408 if not bb_utils.TESTING:
409 # Restart adb to work around bugs, sleep to wait for usb discovery. 409 # Restart adb to work around bugs, sleep to wait for usb discovery.
410 device_utils.RestartServer() 410 device_utils.RestartServer()
411 RunCmd(['sleep', '1']) 411 RunCmd(['sleep', '1'])
412 provision_cmd = ['build/android/provision_devices.py', '-t', options.target] 412 provision_cmd = ['build/android/provision_devices.py', '-t', options.target]
413 if options.auto_reconnect: 413 if options.auto_reconnect:
414 provision_cmd.append('--auto-reconnect') 414 provision_cmd.append('--auto-reconnect')
415 if options.skip_wipe: 415 if options.skip_wipe:
416 provision_cmd.append('--skip-wipe') 416 provision_cmd.append('--skip-wipe')
417 RunCmd(provision_cmd) 417 RunCmd(provision_cmd, halt_on_failure=True)
418 418
419 419
420 def DeviceStatusCheck(options): 420 def DeviceStatusCheck(options):
421 bb_annotations.PrintNamedStep('device_status_check') 421 bb_annotations.PrintNamedStep('device_status_check')
422 cmd = ['build/android/buildbot/bb_device_status_check.py'] 422 cmd = ['build/android/buildbot/bb_device_status_check.py']
423 if options.restart_usb: 423 if options.restart_usb:
424 cmd.append('--restart-usb') 424 cmd.append('--restart-usb')
425 RunCmd(cmd, halt_on_failure=True) 425 RunCmd(cmd, halt_on_failure=True)
426 426
427 427
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 689
690 if options.coverage_bucket: 690 if options.coverage_bucket:
691 setattr(options, 'coverage_dir', 691 setattr(options, 'coverage_dir',
692 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) 692 os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
693 693
694 MainTestWrapper(options) 694 MainTestWrapper(options)
695 695
696 696
697 if __name__ == '__main__': 697 if __name__ == '__main__':
698 sys.exit(main(sys.argv)) 698 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