scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg_fail_device_check.json - Issue 2143013002: Revert "[Android] Reland splitting of device recovery and device status."

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: scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg_fail_device_check.json

Issue 2143013002: Revert "[Android] Reland splitting of device recovery and device status." (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: 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 | « scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg.json ('k') | scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android32_tests__l_nexus5_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg_fail_device_check.json

diff --git a/scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg_fail_device_check.json b/scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg_fail_device_check.json

index 2b88e7dceea41fbbe3ca64fb9aa877e9232af960..d203396e1dd3b3ad14ce788d47f6821540b7ca9c 100644

--- a/scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg_fail_device_check.json

+++ b/scripts/slave/recipes/mojo.expected/mojo_android_builder_tests_dbg_fail_device_check.json

@@ -98,38 +98,16 @@

{

"cmd": [

- "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",

- "--known-devices-file",

- "[HOME]/.android/known_devices.json",

- "--adb-path",

- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",

- "-v"

- ],

- "name": "device_recovery"

- },

- {

- "cmd": [

- "python",

- "-u",

- "[SLAVE_BUILD]/src/build/android/provision_devices.py"

- ],

- "name": "provision_device"

- },

- {

- "cmd": [

"python",

"-u",

- "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_status.py",

+ "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",

"--json-output",

"/path/to/tmp/json",

+ "--restart-usb",

"--known-devices-file",

- "[HOME]/.android/known_devices.json",

- "--buildbot-path",

- "/home/chrome-bot/.adb_device_info",

- "-v",

- "--overwrite-known-devices-files"

+ "[BUILD]/site_config/.known_devices"

- "name": "device_status",

+ "name": "device_status_check",

"~followup_annotations": [

"step returned non-zero exit code: 1",

"@@@STEP_LOG_LINE@json.output (invalid)@null@@@",

@@ -140,7 +118,7 @@

{

"name": "$result",

- "reason": "Infra Failure: Step('device_status') returned 1",

+ "reason": "Infra Failure: Step('device_status_check') returned 1",

"recipe_result": null,

"status_code": 1

}