[BattOr] Add real device smoke test

common/battor/battor/battor_wrapper.py

 # Copyright 2016 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 os
 import platform
 import subprocess
 import sys
 import tempfile
 import time
 
 from battor import battor_error
 import dependency_manager
 from devil.utils import battor_device_mapping
 from devil.utils import find_usb_devices
 
+sys.path.insert(
+    1, os.path.join(os.path.dirname(__file__), '..', '..', '..', 'telemetry',
+                    'third_party', 'pyserial'))
+try:
+  import serial
+  from serial.tools import list_ports
+except:

[nednguyen, 2016/04/26 04:02:53]

We can remove this now :-)

[rnephew (Reviews Here), 2016/04/26 15:15:44]

Done.

+  print
+  print '-----------------------'
+  print serial.__file__
+  print '======================='
+  raise
 
 class BattorWrapper(object):
   """A class for communicating with a BattOr in python."""
   _START_TRACING_CMD = 'StartTracing'
   _STOP_TRACING_CMD = 'StopTracing'
   _SUPPORTS_CLOCKSYNC_CMD = 'SupportsExplicitClockSync'
   _RECORD_CLOCKSYNC_CMD = 'RecordClockSyncMarker'
   _SUPPORTED_PLATFORMS = ['android', 'chromeos', 'linux', 'mac', 'win']
 
   def __init__(self, target_platform, android_device=None, battor_path=None,
@@ skipping 94 matching lines @@
       raise TypeError('sync_id must be a string.')
     self._SendBattorCommand('%s %s' % (self._RECORD_CLOCKSYNC_CMD, sync_id))
 
   def _GetBattorPath(self, target_platform, android_device=None,
                      battor_path=None, battor_map_file=None, battor_map=None):
     """Determines most likely path to the correct BattOr."""
     if target_platform not in self._SUPPORTED_PLATFORMS:
       raise battor_error.BattorError(
           '%s is an unsupported platform.' % target_platform)
     if target_platform in ['win']:
-      # TODO: We need a way to automatically detect correct port.
-      # crbug.com/60397
-      return 'COM3'
+      for (port, desc, _) in serial.tools.list_ports.comports():

[charliea (OOO until 10-5), 2016/04/26 13:30:38]

Later on, we should probably add a flag to the BattOr Agent on Windows to do
this. something like --autodetect-battor-windows. We can't (and shouldn't) do
this by default for reasons (something being named "USB serial port" isn't
justification enough to start sending it random serial data, just in case it's
like an ICBM launcher or something), but it'd be nice if we have an "I know what
I'm doing" flag.

[nednguyen, 2016/04/26 15:10:57]

There should be way for us to grab the "Battor 3.2.1" name from the serial port,
just like how Windows manager display it. We probably just haven't digged deep
enough.

[rnephew (Reviews Here), 2016/04/26 15:15:44]

Acknowledged.

+        if 'USB Serial Port' in desc:
+          return port
+      raise battor_error.BattorError(
+          'Could not find BattOr attached to machine.')
     device_tree = find_usb_devices.GetBusNumberToDeviceTreeMap(fast=True)
     if battor_path:
       if not isinstance(battor_path, basestring):
         raise battor_error.BattorError('An invalid BattOr path was specified.')
       return battor_path
 
     if target_platform == 'android':
       if not android_device:
         raise battor_error.BattorError(
             'Must specify device for Android platform.')
@@ skipping 24 matching lines @@
     status = self._SendBattorCommandImpl(cmd, return_results=check_return)
     if check_return and not 'Done.' in status:
       raise battor_error.BattorError(
           'BattOr did not complete command \'%s\' correctly.\n'
           'Outputted: %s' % (cmd, status))
     return status
 
   def _StartShellImpl(self, battor_cmd):
     return subprocess.Popen(
         battor_cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, shell=False)