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

systrace/systrace/tracing_agents/battor_trace_agent_unittest.py

Index: systrace/systrace/tracing_agents/battor_trace_agent_unittest.py
diff --git a/systrace/systrace/tracing_agents/battor_trace_agent_unittest.py b/systrace/systrace/tracing_agents/battor_trace_agent_unittest.py
index 5ef2a3faac04d85288473a9770db923e59edbba4..6fd10cc2b0da5803ff772622259e16e0202771d9 100755
--- a/systrace/systrace/tracing_agents/battor_trace_agent_unittest.py
+++ b/systrace/systrace/tracing_agents/battor_trace_agent_unittest.py
@@ -13,6 +13,7 @@ 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.

@@ -39,6 +40,8 @@ def setup_battor_test(StartShell_error, StartTracing_error,
     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):