build/android/pylib/instrumentation/test_runner.py - Issue 854733002: [Android] Fixes for instrumentation in platform mode.

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/instrumentation/test_runner.py

Issue 854733002: [Android] Fixes for instrumentation in platform mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « build/android/pylib/instrumentation/instrumentation_test_instance.py ('k') | build/android/pylib/local/device/local_device_test_run.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 74898c2c366c34130fd15dd2f416575a7bfe959e..ec0baeea1c3647d2ba81b568b1ab6209efec6639 100644

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

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

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

'%s/%s' % (self.test_pkg.GetPackageName(), self.options.test_runner),

raw=True, extras=extras, timeout=timeout, retries=0)

+ def _GenerateTestResult(self, test, instr_statuses, start_ms, duration_ms):

+ return instrumentation_test_instance.GenerateTestResult(

+ test, instr_statuses, start_ms, duration_ms)

#override

def RunTest(self, test):

results = base_test_result.TestRunResults()

@@ -344,8 +348,7 @@ class TestRunner(base_test_runner.BaseTestRunner):

# Parse the test output

_, _, statuses = (

instrumentation_test_instance.ParseAmInstrumentRawOutput(raw_output))

- result = instrumentation_test_instance.GenerateTestResult(

- test, statuses, start_ms, duration_ms)

+ result = self._GenerateTestResult(test, statuses, start_ms, duration_ms)

if local_device_instrumentation_test_run.DidPackageCrashOnDevice(

self.test_pkg.GetPackageName(), self.device):

result.SetType(base_test_result.ResultType.CRASH)