Only check if setup wizard is disabled if doing provision check.

build/android/buildbot/bb_device_status_check.py

 #!/usr/bin/env python
 #
 # Copyright 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.
 
 """A class to keep track of devices across builds and report state."""
 import logging
 import optparse
 import os
@@ skipping 23 matching lines @@
   """
 
   device_adb = android_commands.AndroidCommands(serial)
 
   # TODO(navabi): Replace AdbShellCmd with device_adb.
   device_type = device_adb.GetBuildProduct()
   device_build = device_adb.GetBuildId()
   device_build_type = device_adb.GetBuildType()
   device_product_name = device_adb.GetProductName()
 
-  setup_wizard_disabled = device_adb.GetSetupWizardStatus() == 'DISABLED'

[mkosiba (inactive), 2013/08/30 13:13:33]

if you've taken the assert out in GetSetupWizardStatus then you could just
change it to say != 'ENABLED', right?

[navabi, 2013/08/30 15:53:10]

That would work too. But we would still be checking the property on the device
and then not using it. Let's say we have a new device that doesn't have that
property (or the name of the property changed).

While we would also need to fix it other places (e.g. android_commands.py), if
we didn't care about it anyway, we could at least run device status check
without having to worry about that property.

   battery = device_adb.GetBatteryInfo()
   install_output = GetCmdOutput(
     ['%s/build/android/adb_install_apk.py' % constants.DIR_SOURCE_ROOT, '--apk',
      '%s/build/android/CheckInstallApk-debug.apk' % constants.DIR_SOURCE_ROOT])
 
   def _GetData(re_expression, line, lambda_function=lambda x:x):
     if not line:
       return 'Unknown'
     found = re.findall(re_expression, line)
     if found and len(found):
@@ skipping 14 matching lines @@
             '  Battery: %s%%' % battery_level,
             '  Battery temp: %s' % battery_temp,
             '  IMEI slice: %s' % imei_slice,
             '  Wifi IP: %s' % device_adb.GetWifiIP(),
             '  Install Speed: %s KB/s' % install_speed,
             '']
 
   errors = []
   if battery_level < 15:
     errors += ['Device critically low in battery. Turning off device.']
-  if (not setup_wizard_disabled and device_build_type != 'user' and
-      not options.no_provisioning_check):
-    errors += ['Setup wizard not disabled. Was it provisioned correctly?']
+  if not options.no_provisioning_check:
+    setup_wizard_disabled = device_adb.GetSetupWizardStatus() == 'DISABLED'
+    if not setup_wizard_disabled and device_build_type != 'user':
+      errors += ['Setup wizard not disabled. Was it provisioned correctly?']
   if device_product_name == 'mantaray' and ac_power != 'true':
     errors += ['Mantaray device not connected to AC power.']
   # TODO(navabi): Insert warning once we have a better handle of what install
   # speeds to expect. The following lines were causing too many alerts.
   # if install_speed < 500:
   #   errors += ['Device install speed too low. Do not use for testing.']
 
   # Causing the device status check step fail for slow install speed or low
   # battery currently is too disruptive to the bots (especially try bots).
   # Turn off devices with low battery and the step does not fail.
@@ skipping 159 matching lines @@
     # devices with critically low battery or install speed. Remove those devices
     # from testing, allowing build to continue with good devices.
     return 1
 
   if not devices:
     return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())