telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent.py - Issue 2162963002: [polymer] Merge of master into polymer10-migration

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent.py

Issue 2162963002: [polymer] Merge of master into polymer10-migration (Closed) Base URL: git@github.com:catapult-project/catapult.git@polymer10-migration

Patch Set: Merge polymer10-migration int polymer10-merge Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « telemetry/telemetry/internal/platform/tracing_agent/atrace_tracing_agent.py ('k') | telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent.py

diff --git a/telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent.py b/telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent.py

index 7c859dbee363417c8b13323f0c62cdac6c0bb8ca..9911cbd05984cd25a8e89ac370e5fd6ed48fdaa7 100644

--- a/telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent.py

+++ b/telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent.py

@@ -101,5 +101,5 @@ class BattOrTracingAgent(tracing_agent.TracingAgent):

record_controller_clock_sync_marker_callback(sync_id, timestamp)

def CollectAgentTraceData(self, trace_data_builder, timeout=None):

- data = '\n'.join(self._battor.CollectTraceData(timeout=timeout))

+ data = self._battor.CollectTraceData(timeout=timeout)

trace_data_builder.SetTraceFor(trace_data.BATTOR_TRACE_PART, data)