build/android/pylib/monkey/test_runner.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: build/android/pylib/monkey/test_runner.py

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

Patch Set: Update monkey test runner. 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:

Index: build/android/pylib/monkey/test_runner.py

diff --git a/build/android/pylib/monkey/test_runner.py b/build/android/pylib/monkey/test_runner.py

index 3fd1797494db4f80b18d0690874fb005e685183a..0b5f1f82e26cd791c616c5885bcaa20d60436f51 100644

--- a/build/android/pylib/monkey/test_runner.py

+++ b/build/android/pylib/monkey/test_runner.py

@@ -66,6 +66,10 @@ class TestRunner(base_test_runner.BaseTestRunner):

# Run the test.

output = ''

if before_pids:

+ if len(before_pids[self._package]) > 1:

jbudorick 2015/07/27 15:25:32 This should probably be before_pids.get(self._pack

Sami 2015/07/27 15:33:23 Done.

+ raise Exception(

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

+ '%s' % (self._package, before_pids))

output = '\n'.join(self._LaunchMonkeyTest())

after_pids = self.device.GetPids(self._package)