build/android/pylib/remote/device/remote_device_instrumentation_test_run.py - Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

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/remote/device/remote_device_instrumentation_test_run.py

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master

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

Index: build/android/pylib/remote/device/remote_device_instrumentation_test_run.py

diff --git a/build/android/pylib/remote/device/remote_device_instrumentation_test_run.py b/build/android/pylib/remote/device/remote_device_instrumentation_test_run.py

index 709a30c7c02aedeba0935ac5bc5065a0d8c4c63d..5138d460899520a619c88d2aa622c6b64768a87b 100644

--- a/build/android/pylib/remote/device/remote_device_instrumentation_test_run.py

+++ b/build/android/pylib/remote/device/remote_device_instrumentation_test_run.py

@@ -40,11 +40,10 @@ class RemoteDeviceInstrumentationTestRun(

base_test_result.ResultType.FAIL))

return r

- result_code, result_bundle, statuses = (

- self._test_instance.ParseAmInstrumentRawOutput(

- self._results['results']['output'].splitlines()))

- result = self._test_instance.GenerateTestResults(

- result_code, result_bundle, statuses, 0, 0)

+ _, errors, parsed_output = self._test_instance.ParseAmInstrumentRawOutput(

+ self._results['results']['output'].splitlines())

+ logging.debug(errors)

+ result = self._test_instance.GenerateMultiTestResult(errors, parsed_output)

if isinstance(result, base_test_result.BaseTestResult):

r.AddResult(result)

« no previous file with comments | « build/android/pylib/local/device/local_device_test_run.py ('k') | build/android/pylib/uiautomator/test_runner.py » ('j') | no next file with comments »