Support traces containing all parts/agents returned via DevTools streams

telemetry/telemetry/timeline/trace_data_unittest.py

 # Copyright 2014 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 cStringIO
 import datetime
 import exceptions
 import json
 import os
 import tempfile
@@ skipping 47 matching lines @@
     d = trace_data.TraceData([])
     self.assertFalse(d.HasTraceFor(trace_data.CHROME_TRACE_PART))
 
   def testEmptyStringValue(self):
     d = trace_data.TraceData('')
     self.assertFalse(d.HasTraceFor(trace_data.CHROME_TRACE_PART))
 
   def testListForm(self):
     d = trace_data.TraceData([{'ph': 'B'}])
     self.assertTrue(d.HasTraceFor(trace_data.CHROME_TRACE_PART))
-    self.assertEquals(1, len(d.GetTraceFor(trace_data.CHROME_TRACE_PART)))
+    events = d.GetTraceFor(trace_data.CHROME_TRACE_PART).get('traceEvents', [])
+    self.assertEquals(1, len(events))
 
   def testStringForm(self):
     d = trace_data.TraceData('[{"ph": "B"}]')
     self.assertTrue(d.HasTraceFor(trace_data.CHROME_TRACE_PART))
-    self.assertEquals(1, len(d.GetTraceFor(trace_data.CHROME_TRACE_PART)))
+    events = d.GetTraceFor(trace_data.CHROME_TRACE_PART).get('traceEvents', [])
+    self.assertEquals(1, len(events))
 
   def testStringForm2(self):
     d = trace_data.TraceData('{"inspectorTimelineEvents": [1]}')
     self.assertTrue(d.HasTraceFor(trace_data.INSPECTOR_TRACE_PART))
     self.assertEquals(1, len(d.GetTraceFor(trace_data.INSPECTOR_TRACE_PART)))
 
   def testCorrectlyMalformedStringForm(self):
     d = trace_data.TraceData("""[
       {"ph": "B"}""")
     self.assertTrue(d.HasTraceFor(trace_data.CHROME_TRACE_PART))
@@ skipping 49 matching lines @@
 
     self.assertRaises(exceptions.Exception,
         lambda: builder.SetTraceFor(trace_data.TELEMETRY_PART, {}))
 
   def testSetTraceForRaisesAfterAsData(self):
     builder = trace_data.TraceDataBuilder()
     builder.AsData()
 
     self.assertRaises(exceptions.Exception,
         lambda: builder.SetTraceFor(trace_data.TELEMETRY_PART, {}))