Index: tools/telemetry/telemetry/core/backends/chrome/tracing_backend_unittest.py |
diff --git a/tools/telemetry/telemetry/core/backends/chrome/tracing_backend_unittest.py b/tools/telemetry/telemetry/core/backends/chrome/tracing_backend_unittest.py |
index a3788174cc04ffd5323031d5547f462ec6b5f5f7..48d8650fe8fc3616c104fdaf47826866a42e5ff0 100644 |
--- a/tools/telemetry/telemetry/core/backends/chrome/tracing_backend_unittest.py |
+++ b/tools/telemetry/telemetry/core/backends/chrome/tracing_backend_unittest.py |
@@ -10,8 +10,8 @@ from telemetry import decorators |
from telemetry.core import util |
from telemetry.core.platform import tracing_category_filter |
from telemetry.core.platform import tracing_options |
-from telemetry.timeline import model |
-from telemetry.timeline import tracing_timeline_data |
+from telemetry.timeline import model as model_module |
+from telemetry.timeline import trace_data as trace_data_module |
from telemetry.unittest_util import tab_test_case |
@@ -33,9 +33,11 @@ class TracingBackendTest(tab_test_case.TabTestCase): |
options.enable_chrome_trace = True |
self._tracing_controller.Start( |
options, tracing_category_filter.TracingCategoryFilter()) |
+ |
trace_data = self._tracing_controller.Stop() |
# Test that trace data is parsable |
- model.TimelineModel(trace_data) |
+ model = model_module.TimelineModel(trace_data) |
+ assert len(model.processes) > 0 |
@decorators.Disabled('chromeos') # crbug.com/412713. |
def testStartAndStopTraceMultipleTimes(self): |
@@ -47,59 +49,7 @@ class TracingBackendTest(tab_test_case.TabTestCase): |
options, tracing_category_filter.TracingCategoryFilter())) |
trace_data = self._tracing_controller.Stop() |
# Test that trace data is parsable |
- model.TimelineModel(trace_data) |
+ model_module.TimelineModel(trace_data) |
self.assertFalse(self._tracing_controller.is_tracing_running) |
# Calling stop again will raise exception |
self.assertRaises(Exception, self._tracing_controller.Stop) |
- |
- |
-class ChromeTraceResultTest(unittest.TestCase): |
- def __init__(self, method_name): |
- super(ChromeTraceResultTest, self).__init__(method_name) |
- |
- def testWrite1(self): |
- ri = tracing_timeline_data.TracingTimelineData(map(json.loads, [])) |
- f = cStringIO.StringIO() |
- ri.Serialize(f) |
- v = f.getvalue() |
- |
- j = json.loads(v) |
- assert 'traceEvents' in j |
- self.assertEquals(j['traceEvents'], []) |
- |
- def testWrite2(self): |
- ri = tracing_timeline_data.TracingTimelineData(map(json.loads, [ |
- '"foo"', |
- '"bar"'])) |
- f = cStringIO.StringIO() |
- ri.Serialize(f) |
- v = f.getvalue() |
- |
- j = json.loads(v) |
- assert 'traceEvents' in j |
- self.assertEquals(j['traceEvents'], ['foo', 'bar']) |
- |
- def testWrite3(self): |
- ri = tracing_timeline_data.TracingTimelineData(map(json.loads, [ |
- '"foo"', |
- '"bar"', |
- '"baz"'])) |
- f = cStringIO.StringIO() |
- ri.Serialize(f) |
- v = f.getvalue() |
- |
- j = json.loads(v) |
- assert 'traceEvents' in j |
- self.assertEquals(j['traceEvents'], |
- ['foo', 'bar', 'baz']) |
- |
- def testBrowserProcess(self): |
- ri = tracing_timeline_data.TracingTimelineData(map(json.loads, [ |
- '{"name": "process_name",' |
- '"args": {"name": "Browser"},' |
- '"pid": 5, "ph": "M"}', |
- '{"name": "thread_name",' |
- '"args": {"name": "CrBrowserMain"},' |
- '"pid": 5, "tid": 32578, "ph": "M"}'])) |
- timeline_model = model.TimelineModel(ri) |
- self.assertEquals(timeline_model.browser_process.pid, 5) |