client/tests/tracing_microbenchmark/tracers.py - Issue 6246035: Merge remote branch 'cros/upstream' into master

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: client/tests/tracing_microbenchmark/tracers.py

Issue 6246035: Merge remote branch 'cros/upstream' into master (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master

Patch Set: patch Created 9 years, 11 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:

Index: client/tests/tracing_microbenchmark/tracers.py

diff --git a/client/tests/tracing_microbenchmark/tracers.py b/client/tests/tracing_microbenchmark/tracers.py

index bdd5194de0ccfa8caf52f0acecb5f961378fd880..08ca7e335ab8ae552b7ebd7cb10889fb89c4a0ef 100644

--- a/client/tests/tracing_microbenchmark/tracers.py

+++ b/client/tests/tracing_microbenchmark/tracers.py

@@ -56,5 +56,5 @@ class ftrace(base_tracer.Tracer):

cpu_key = '%s_%s' % (cpu, key)

total_key = 'total_' + key

results[cpu_key] = val

- results[total_key] = (results.get(total_key, 0) +

+ results[total_key] = (results.get(total_key, 0) +

results[cpu_key])