[BattOr][Telemetry] Changes needed to run BattOr tests on telemetry.

telemetry/telemetry/timeline/trace_data_unittest.py

Index: telemetry/telemetry/timeline/trace_data_unittest.py
diff --git a/telemetry/telemetry/timeline/trace_data_unittest.py b/telemetry/telemetry/timeline/trace_data_unittest.py
index 8fa3fe6a4c77c2902e058d69e9fca88298917e21..15c487d32684f762afe76a58484a404f702325eb 100644
--- a/telemetry/telemetry/timeline/trace_data_unittest.py
+++ b/telemetry/telemetry/timeline/trace_data_unittest.py
@@ -25,7 +25,7 @@ class TraceDataTest(unittest.TestCase):
 
   def testSerializeZip(self):
     data = trace_data.TraceData({'traceEvents': [1, 2, 3],
-                                 'battor': ['battor_data']})
+                                 'powerTraceAsString': 'battor_data'})
     tf = tempfile.NamedTemporaryFile(delete=False)
     temp_name = tf.name
     tf.close()
@@ -34,7 +34,7 @@ class TraceDataTest(unittest.TestCase):
       self.assertTrue(zipfile.is_zipfile(temp_name))
       z = zipfile.ZipFile(temp_name, 'r')
 
-      self.assertIn('battor', z.namelist())
+      self.assertIn('powerTraceAsString', z.namelist())
       self.assertIn('traceEvents', z.namelist())
       z.close()
     finally:
@@ -90,7 +90,8 @@ class TraceDataBuilderTest(unittest.TestCase):
     builder = trace_data.TraceDataBuilder()
     builder.AddEventsTo(trace_data.CHROME_TRACE_PART, [1, 2, 3])
     builder.AddEventsTo(trace_data.TAB_ID_PART, ['tab-7'])
-    builder.AddEventsTo(trace_data.BATTOR_TRACE_PART, ['battor data here'])
+    builder.AddEventsTo(
+        trace_data.BATTOR_TRACE_PART, 'battor data here', as_string=True)
 
     d = builder.AsData()
     self.assertTrue(d.HasEventsFor(trace_data.CHROME_TRACE_PART))
@@ -98,3 +99,14 @@ class TraceDataBuilderTest(unittest.TestCase):
     self.assertTrue(d.HasEventsFor(trace_data.BATTOR_TRACE_PART))
 
     self.assertRaises(Exception, builder.AsData)
+
+  def testAsStringWithList(self):
+    builder = trace_data.TraceDataBuilder()
+    with self.assertRaises(AssertionError):
+      builder.AddEventsTo(trace_data.BATTOR_TRACE_PART,
+                          ['battor data here'], as_string=True)
+
+  def testNotAsStringWithString(self):
+    builder = trace_data.TraceDataBuilder()
+    with self.assertRaises(AssertionError):
+      builder.AddEventsTo(trace_data.CHROME_TRACE_PART, 'data here')