[Android] Don't use a device blacklist if one isn't provided. (RELAND 2)

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import glob
 import hashlib
 import json
 import os
@@ skipping 144 matching lines @@
     suites: List of suite names to run.
     suites_options: Command line options dictionary for particular suites.
                     For example,
                     {'content_browsertests', ['--num_retries=1', '--release']}
                     will add the options only to content_browsertests.
   """
 
   if not suites_options:
     suites_options = {}
 
-  args = ['--verbose']
+  args = ['--verbose', '--blacklist-file', 'out/bad_devices.json']
   if options.target == 'Release':
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
   if options.gtest_filter:
     args.append('--gtest-filter=%s' % options.gtest_filter)
 
   for suite in suites:
     bb_annotations.PrintNamedStep(suite)
     cmd = [suite] + args
@@ skipping 24 matching lines @@
   """Install an apk to all phones.
 
   Args:
     options: options object
     test: An I_TEST namedtuple
     print_step: Print a buildbot step
   """
   if print_step:
     bb_annotations.PrintNamedStep('install_%s' % test.name.lower())
 
-  args = ['--apk_package', test.apk_package]
+  args = [
+      '--apk_package', test.apk_package,
+      '--blacklist-file', 'out/bad_devices.json',
+  ]
   if options.target == 'Release':
     args.append('--release')
   args.append(test.apk)
 
   RunCmd(['build/android/adb_install_apk.py'] + args, halt_on_failure=True)
 
 
 def RunInstrumentationSuite(options, test, flunk_on_failure=True,
                             python_only=False, official_build=False):
   """Manages an invocation of test_runner.py for instrumentation tests.
 
   Args:
     options: options object
     test: An I_TEST namedtuple
     flunk_on_failure: Flunk the step if tests fail.
     Python: Run only host driven Python tests.
     official_build: Run official-build tests.
   """
   bb_annotations.PrintNamedStep('%s_instrumentation_tests' % test.name.lower())
 
   if test.apk:
     InstallApk(options, test)
-  args = ['--test-apk', test.test_apk, '--verbose']
+  args = [
+      '--test-apk', test.test_apk, '--verbose',
+      '--blacklist-file', 'out/bad_devices.json'
+  ]
   if test.test_data:
     args.extend(['--test_data', test.test_data])
   if options.target == 'Release':
     args.append('--release')
   if options.asan:
     args.append('--tool=asan')
   if options.flakiness_server:
     args.append('--flakiness-dashboard-server=%s' %
                 options.flakiness_server)
   if options.coverage_bucket:
@@ skipping 183 matching lines @@
   RunCmd(['sleep', '5'])
 
 
 def ProvisionDevices(options):
   bb_annotations.PrintNamedStep('provision_devices')
 
   if not bb_utils.TESTING:
     # Restart adb to work around bugs, sleep to wait for usb discovery.
     device_utils.RestartServer()
     RunCmd(['sleep', '1'])
-  provision_cmd = ['build/android/provision_devices.py', '-t', options.target]
+  provision_cmd = [
+      'build/android/provision_devices.py', '-t', options.target,
+      '--blacklist-file', 'out/bad_devices.json'
+  ]
   if options.auto_reconnect:
     provision_cmd.append('--auto-reconnect')
   if options.skip_wipe:
     provision_cmd.append('--skip-wipe')
   if options.disable_location:
     provision_cmd.append('--disable-location')
   RunCmd(provision_cmd, halt_on_failure=True)
 
 
 def DeviceStatusCheck(options):
   bb_annotations.PrintNamedStep('device_status_check')
-  cmd = ['build/android/buildbot/bb_device_status_check.py']
+  cmd = [
+      'build/android/buildbot/bb_device_status_check.py',
+      '--blacklist-file', 'out/bad_devices.json',
+  ]
   if options.restart_usb:
     cmd.append('--restart-usb')
   RunCmd(cmd, halt_on_failure=True)
 
 
 def GetDeviceSetupStepCmds():
   return [
       ('device_status_check', DeviceStatusCheck),
       ('provision_devices', ProvisionDevices),
   ]
@@ skipping 27 matching lines @@
           '--browser',
           'android-content-shell',
           '--build-revision',
           str(revision),
           '--upload-refimg-to-cloud-storage',
           '--refimg-cloud-storage-bucket',
           'chromium-gpu-archive/reference-images',
           '--os-type',
           'android',
           '--test-machine-name',
-          EscapeBuilderName(builder_name)])
+          EscapeBuilderName(builder_name),
+          '--android-blacklist-file',
+          'out/bad_devices.json'])
 
   bb_annotations.PrintNamedStep('webgl_conformance_tests')
   RunCmd(['content/test/gpu/run_gpu_test.py', '-v',
           '--browser=android-content-shell', 'webgl_conformance',
-          '--webgl-conformance-version=1.0.1'])
+          '--webgl-conformance-version=1.0.1',
+          '--android-blacklist-file',
+          'out/bad_devices.json'])
 
   bb_annotations.PrintNamedStep('android_webview_webgl_conformance_tests')
   RunCmd(['content/test/gpu/run_gpu_test.py', '-v',
           '--browser=android-webview-shell', 'webgl_conformance',
-          '--webgl-conformance-version=1.0.1'])
+          '--webgl-conformance-version=1.0.1',
+          '--android-blacklist-file',
+          'out/bad_devices.json'])
 
   bb_annotations.PrintNamedStep('gpu_rasterization_tests')
   RunCmd(['content/test/gpu/run_gpu_test.py',
           'gpu_rasterization', '-v',
           '--browser',
           'android-content-shell',
           '--build-revision',
           str(revision),
           '--test-machine-name',
-          EscapeBuilderName(builder_name)])
+          EscapeBuilderName(builder_name),
+          '--android-blacklist-file',
+          'out/bad_devices.json'])
 
 
 def RunPythonUnitTests(_options):
   for suite in constants.PYTHON_UNIT_TEST_SUITES:
     bb_annotations.PrintNamedStep(suite)
     RunCmd(['build/android/test_runner.py', 'python', '-s', suite])
 
 
 def GetTestStepCmds():
   return [
@@ skipping 205 matching lines @@
 
   if options.coverage_bucket:
     setattr(options, 'coverage_dir',
             os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))