systrace/systrace/tracing_agents/battor_trace_agent_unittest.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: systrace/systrace/tracing_agents/battor_trace_agent_unittest.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

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 903042dcd75df2f58c574d878d14ac07d820a50d..81f946ba4c86fab8386f2b2c9a370879b84165a5 100755

--- a/systrace/systrace/tracing_agents/battor_trace_agent_unittest.py

+++ b/systrace/systrace/tracing_agents/battor_trace_agent_unittest.py

@@ -79,7 +79,7 @@ class MockBattorWrapper(object):

assert self._output

if self._CollectTraceData_error:

raise RuntimeError('Simulated error in CollectTraceData')

- return ['traceout1', 'traceout2']

+ return 'traceout1\ntraceout2'

class MockBatteryUtils(object):

def __init__(self, _):

« no previous file with comments | « systrace/systrace/tracing_agents/battor_trace_agent.py ('k') | telemetry/examples/benchmarks/tbm_benchmark.py » ('j') | no next file with comments »