Minor fixes to android device_status script

build/android/device_status_check.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012 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 optparse
 import os
 import sys
 
+from pylib import buildbot_report
 from pylib.android_commands import GetAttachedDevices
 from pylib.cmd_helper import GetCmdOutput
 
 
 def DeviceInfo(serial):
   """Gathers info on a device via various adb calls.
 
   Args:
     serial: The serial of the attached device to construct info about.
 
@@ skipping 40 matching lines @@
   last_devices = []
   try:
     with open(last_devices_path) as f:
       last_devices = f.read().splitlines()
   except IOError:
     # Ignore error, file might not exist
     pass
 
   missing_devs = list(set(last_devices) - set(adb_online_devs))
   if missing_devs:
-    print '@@@STEP_WARNINGS@@@'
-    print '@@@STEP_SUMMARY_TEXT@%s not detected.@@@' % missing_devs
+    buildbot_report.PrintWarning()
+    buildbot_report.PrintSummaryText(
+        '%d devices not detected.' % len(missing_devs))
     print 'Current online devices: %s' % adb_online_devs
     print '%s are no longer visible. Were they removed?\n' % missing_devs
     print 'SHERIFF: See go/chrome_device_monitor'
     print 'Cache file: %s\n\n' % last_devices_path
     print 'adb devices'
     print GetCmdOutput(['adb', 'devices'])
   else:
     new_devs = set(adb_online_devs) - set(last_devices)
-    if new_devs:
-      print '@@@STEP_WARNINGS@@@'
-      print '@@@STEP_SUMMARY_TEXT@New devices detected :-)@@@'
+    if new_devs and os.path.exists(last_devices_path):
+      buildbot_report.PrintWarning()
+      buildbot_report.PrintSummaryText(
+          '%d new devices detected' % len(new_devs))
       print ('New devices detected %s. And now back to your '
              'regularly scheduled program.' % list(new_devs))
 
   # Write devices currently visible plus devices previously seen.
   with open(last_devices_path, 'w') as f:
     f.write('\n'.join(set(adb_online_devs + last_devices)))
 
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option('', '--out-dir',
                     help='Directory where the device path is stored',
                     default=os.path.join(os.path.dirname(__file__), '..',
                                          '..', 'out'))
 
   options, args = parser.parse_args()
   if args:
     parser.error('Unknown options %s' % args)
+  buildbot_report.PrintNamedStep('Device Status Check')
   devices = GetAttachedDevices()
-
   types, builds, reports = [], [], []
   if devices:
     types, builds, reports = zip(*[DeviceInfo(dev) for dev in devices])
 
   unique_types = list(set(types))
   unique_builds = list(set(builds))
 
-  print ('@@@BUILD_STEP Device Status Check - '
-         '%d online devices, types %s, builds %s@@@'
-         % (len(devices), unique_types, unique_builds))
+  buildbot_report.PrintMsg('Online devices: %d. Device types %s, builds %s'
+                           % (len(devices), unique_types, unique_builds))
   print '\n'.join(reports)
   CheckForMissingDevices(options, devices)
 
 if __name__ == '__main__':
   sys.exit(main())