[Systrace][BattOr] Simplify BattOr options in systrace.

systrace/systrace/tracing_agents/battor_trace_agent_unittest.py

 #!/usr/bin/env python
 
 # 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.
 
 from collections import namedtuple
 import unittest
 import logging
 
 from systrace import decorators
 from systrace.tracing_agents import battor_trace_agent
 from battor import battor_wrapper
 from devil.android import battery_utils
 from devil.utils import battor_device_mapping
+from devil.utils import find_usb_devices
 
 
 mock_opts = namedtuple('mock_opts', ['target', 'device_serial_number',

[charliea (OOO until 10-5), 2017/03/14 18:35:54]

Looks like there might be some stuff in this section that needs to be updated?

[rnephew (Reviews Here), 2017/03/15 16:22:35]

Done.

                                      'hub_types', 'battor_path',
                                      'update_map', 'serial_map'])
 OPTIONS = mock_opts('android', 'Phn2', ['plugable_7port'],
                     None, False, __file__)
 CATEGORIES = None
 
 
 def raise_error(*args, **kwargs):
   del args
   del kwargs
   raise RuntimeError('Should not call this function in the test')
 
 battor_device_mapping.GenerateSerialMapFile = raise_error
 
 def setup_battor_test(StartShell_error, StartTracing_error,
                       StopTracing_error, CollectTraceData_error):
   wrapper = MockBattOrWrapper(StartShell_error, StartTracing_error,
                               StopTracing_error, CollectTraceData_error)
   def wrapper_maker(*args, **kwargs):
     del args
     del kwargs
     return wrapper
   battor_wrapper.BattOrWrapper = wrapper_maker
+  find_usb_devices.GetBusNumberToDeviceTreeMap = lambda: None
+  battor_device_mapping.GetBattOrList = lambda x: ['/dev/ttyUSB0']
 
 
 class MockBattOrWrapper(object):
   def __init__(self, StartShell_error=False, StartTracing_error=False,
                StopTracing_error=False, CollectTraceData_error=False):
     self._StartShell_error = StartShell_error
     self._StartTracing_error = StartTracing_error
     self._StopTracing_error = StopTracing_error
     self._CollectTraceData_error = CollectTraceData_error
     self._running = False
@@ skipping 97 matching lines @@
     agent = battor_trace_agent.BattOrTraceAgent()
     agent.StartAgentTracing(OPTIONS, CATEGORIES)
     agent.StopAgentTracing()
     x = agent.GetResults()
     self.assertEqual(x.raw_data, 'traceout1\ntraceout2')
 
 
 if __name__ == "__main__":
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)