| Index: scripts/slave/recipes/android/perf.expected/host_info_failure.json
|
| diff --git a/scripts/slave/recipes/android/perf.expected/src_side_script_fails.json b/scripts/slave/recipes/android/perf.expected/host_info_failure.json
|
| similarity index 93%
|
| copy from scripts/slave/recipes/android/perf.expected/src_side_script_fails.json
|
| copy to scripts/slave/recipes/android/perf.expected/host_info_failure.json
|
| index 83bd3e98d1dbde2e202808f532b8141ed3cb7066..acaa9864e9f519449883ae3b0451fbc7e325de49 100644
|
| --- a/scripts/slave/recipes/android/perf.expected/src_side_script_fails.json
|
| +++ b/scripts/slave/recipes/android/perf.expected/host_info_failure.json
|
| @@ -114,16 +114,7 @@
|
| "name": "read test spec (chromium.perf.json)",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"Android Nexus5 Perf (1)\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"scripts\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"name\": \"host_info\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"script\": \"host_info.py\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| },
|
| @@ -446,8 +437,6 @@
|
| },
|
| {
|
| "cmd": [
|
| - "python",
|
| - "-u",
|
| "[SLAVE_BUILD]/src/testing/scripts/host_info.py",
|
| "--build-config-fs",
|
| "Release",
|
| @@ -459,15 +448,55 @@
|
| "--output",
|
| "/path/to/tmp/json"
|
| ],
|
| - "name": "host_info",
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| + },
|
| + "name": "Host_Info",
|
| "~followup_annotations": [
|
| - "step returned non-zero exit code: 1",
|
| + "step returned non-zero exit code: 87",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"_host_info\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"devices\": [@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Max charging current\": \"500000\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"level\": \"100\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"present\": \"true\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"scale\": \"100\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"status\": \"5\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"technology\": \"Li-ion\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"temperature\": \"240\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"voltage\": \"4302\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"blacklisted\": null, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"imei_slice\": \"\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"ro.build.fingerprint\": \"fingerprint\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"ro.build.id\": \"MDB08Q\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"ro.build.product\": \"bullhead\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"serial\": \"00d0d567893340f4\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"usb_status\": true, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"wifi_ip\": \"\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ ], @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"free_disk_space\": \"free_disk_space\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"num_cpus\": \"num_cpus\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"os_release\": \"os_release\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"os_system\": \"os_system\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"processor\": \"processor\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"python_path\": \"python_path\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"python_version\": \"python_version\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@STEP_FAILURE@@@"
|
| + "@@@STEP_EXCEPTION@@@"
|
| ]
|
| },
|
| {
|
| @@ -785,8 +814,7 @@
|
| },
|
| {
|
| "name": "$result",
|
| - "reason": "src-side perf tests failed [StepFailure(\"1 tests failed: ['host_info']\",)]",
|
| "recipe_result": null,
|
| - "status_code": 1
|
| + "status_code": 0
|
| }
|
| ]
|
|
|