telemetry/telemetry/internal/platform/tracing_agent/chrome_tracing_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: telemetry/telemetry/internal/platform/tracing_agent/chrome_tracing_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

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

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

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

index 7d39a9e3be919f5e2c52bca32aea908f53eb1132..388c121601353c7d08ced1de6ddc4f1489643376 100644

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

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

@@ -90,8 +90,7 @@ class ChromeTracingAgentTest(unittest.TestCase):

agent = chrome_tracing_agent.ChromeTracingAgent(platform_backend)

config = tracing_config.TracingConfig()

config.enable_chrome_trace = enable_chrome_trace

- config.chrome_trace_config.tracing_category_filter.AddIncludedCategory(

- 'foo')

+ config.chrome_trace_config.category_filter.AddIncludedCategory('foo')

agent._platform_backend.tracing_controller_backend.is_tracing_running = True

agent._test_config = config

agent.StartAgentTracing(config, 10)