tools/telemetry/telemetry/internal/backends/chrome/android_browser_backend.py - Issue 1254843002: telemetry: Fix killing the perf profiler

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: tools/telemetry/telemetry/internal/backends/chrome/android_browser_backend.py

Issue 1254843002: telemetry: Fix killing the perf profiler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Review comments. Created 5 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 | « tools/telemetry/telemetry/internal/backends/android_browser_backend_settings.py ('k') | tools/telemetry/telemetry/internal/platform/profiler/perf_profiler.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/internal/backends/chrome/android_browser_backend.py

diff --git a/tools/telemetry/telemetry/internal/backends/chrome/android_browser_backend.py b/tools/telemetry/telemetry/internal/backends/chrome/android_browser_backend.py

index d2ce9a5f546539fc11a6dc62ced33b007e1567fa..f9ea8c4fb5a495fe74bebfc385d9c7fee7b2f48d 100644

--- a/tools/telemetry/telemetry/internal/backends/chrome/android_browser_backend.py

+++ b/tools/telemetry/telemetry/internal/backends/chrome/android_browser_backend.py

@@ -141,7 +141,11 @@ class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):

pids = self.device.GetPids(self._backend_settings.package)

if not pids or self._backend_settings.package not in pids:

raise exceptions.BrowserGoneException(self.browser)

- return int(pids[self._backend_settings.package])

+ if len(pids[self._backend_settings.package]) > 1:

+ raise Exception(

+ 'At most one instance of process %s expected but found pids: '

+ '%s' % (self._backend_settings.package, pids))

+ return int(pids[self._backend_settings.package][0])

@property

def browser_directory(self):