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

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

Issue 1334803002: Revert of [Android] Don't use a device blacklist if one isn't provided. (RELAND) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
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 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 provision_cmd.append('--auto-reconnect') 439 provision_cmd.append('--auto-reconnect')
440 if options.skip_wipe: 440 if options.skip_wipe:
441 provision_cmd.append('--skip-wipe') 441 provision_cmd.append('--skip-wipe')
442 if options.disable_location: 442 if options.disable_location:
443 provision_cmd.append('--disable-location') 443 provision_cmd.append('--disable-location')
444 RunCmd(provision_cmd, halt_on_failure=True) 444 RunCmd(provision_cmd, halt_on_failure=True)
445 445
446 446
447 def DeviceStatusCheck(options): 447 def DeviceStatusCheck(options):
448 bb_annotations.PrintNamedStep('device_status_check') 448 bb_annotations.PrintNamedStep('device_status_check')
449 cmd = [ 449 cmd = ['build/android/buildbot/bb_device_status_check.py']
450 'build/android/buildbot/bb_device_status_check.py',
451 '--blacklist-file', 'out/bad_devices.json',
452 ]
453 if options.restart_usb: 450 if options.restart_usb:
454 cmd.append('--restart-usb') 451 cmd.append('--restart-usb')
455 RunCmd(cmd, halt_on_failure=True) 452 RunCmd(cmd, halt_on_failure=True)
456 453
457 454
458 def GetDeviceSetupStepCmds(): 455 def GetDeviceSetupStepCmds():
459 return [ 456 return [
460 ('device_status_check', DeviceStatusCheck), 457 ('device_status_check', DeviceStatusCheck),
461 ('provision_devices', ProvisionDevices), 458 ('provision_devices', ProvisionDevices),
462 ] 459 ]
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 733
737 if options.coverage_bucket: 734 if options.coverage_bucket:
738 setattr(options, 'coverage_dir', 735 setattr(options, 'coverage_dir',
739 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) 736 os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
740 737
741 MainTestWrapper(options) 738 MainTestWrapper(options)
742 739
743 740
744 if __name__ == '__main__': 741 if __name__ == '__main__':
745 sys.exit(main(sys.argv)) 742 sys.exit(main(sys.argv))
OLDNEW
« no previous file with comments | « build/android/buildbot/bb_device_status_check.py ('k') | build/android/devil/android/device_blacklist.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698