Android / Telemetry: final cleanup on perf_tests_helper.

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
 import smtplib
 import sys
 import re
 import urllib
 
 import bb_annotations
 
+sys.path.append(os.path.join(os.path.dirname(__file__),
+                             os.pardir, os.pardir, 'util', 'lib',
+                             'common'))
+import perf_tests_results_helper  # pylint: disable=F0401
+
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 from pylib import android_commands
 from pylib import constants
-from pylib import perf_tests_helper
 from pylib.cmd_helper import GetCmdOutput
 
 
 def DeviceInfo(serial, options):
   """Gathers info on a device via various adb calls.
 
   Args:
     serial: The serial of the attached device to construct info about.
 
   Returns:
@@ skipping 205 matching lines @@
       err_msg += ['%s errors:' % serial]
       err_msg += ['    %s' % error for error in dev_errors]
 
   if err_msg:
     bb_annotations.PrintWarning()
     msg = '\n'.join(err_msg)
     print msg
     SendDeviceStatusAlert(msg)
 
   if options.device_status_dashboard:
-    perf_tests_helper.PrintPerfResult('BotDevices', 'OnlineDevices',
-                                      [len(devices)], 'devices')
-    perf_tests_helper.PrintPerfResult('BotDevices', 'OfflineDevices',
-                                      [len(offline_devices)], 'devices',
-                                      'unimportant')
+    perf_tests_results_helper.PrintPerfResult('BotDevices', 'OnlineDevices',
+                                              [len(devices)], 'devices')
+    perf_tests_results_helper.PrintPerfResult('BotDevices', 'OfflineDevices',
+                                              [len(offline_devices)], 'devices',
+                                              'unimportant')
     for serial, battery in zip(devices, batteries):
-      perf_tests_helper.PrintPerfResult('DeviceBattery', serial, [battery], '%',
-                                        'unimportant')
+      perf_tests_results_helper.PrintPerfResult('DeviceBattery', serial,
+                                                [battery], '%',
+                                                'unimportant')
 
   if False in fail_step_lst:
     # TODO(navabi): Build fails on device status check step if there exists any
     # 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())