telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend_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/backends/chrome_inspector/tracing_backend_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/backends/chrome_inspector/inspector_backend.py ('k') | telemetry/telemetry/internal/browser/browser.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend_unittest.py

diff --git a/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend_unittest.py b/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend_unittest.py

index 2b965c183aa3a38a916cb16417be123dac4faec3..6181bffd696c147dad4ec0125f0fa1c167d27242 100644

--- a/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend_unittest.py

+++ b/telemetry/telemetry/internal/backends/chrome_inspector/tracing_backend_unittest.py

@@ -23,7 +23,7 @@ class TracingBackendTest(tab_test_case.TabTestCase):

@classmethod

def CustomizeBrowserOptions(cls, options):

- options.enable_logging = True

+ options.logging_verbosity = options.VERBOSE_LOGGING

options.AppendExtraBrowserArgs([

# Memory maps currently cannot be retrieved on sandboxed processes.

# See crbug.com/461788.

@@ -49,7 +49,7 @@ class TracingBackendTest(tab_test_case.TabTestCase):

# Start tracing with memory dumps enabled.

config = tracing_config.TracingConfig()

- config.chrome_trace_config.tracing_category_filter.AddDisabledByDefault(

+ config.chrome_trace_config.category_filter.AddDisabledByDefault(

'disabled-by-default-memory-infra')

config.enable_chrome_trace = True

self._tracing_controller.StartTracing(config)