Reland "Allow multiple devices on bisects hosts "

scripts/slave/recipes/bisection/android_bisect.expected/local_basic_recipe_no_device.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--master",
       "tryserver.chromium.perf",
       "--builder",
       "android_one_perf_bisect",
       "--slave",
       "TestSlavename",
       "--spec",
       "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['android']",
       "--root",
       "src",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
       "--git-cache-dir",
       "[GIT_CACHE]",
       "--issue",
       "12853011",
       "--patchset",
       "1",
       "--rietveld_server",
       "https://codereview.chromium.org",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
-      "src@HEAD",
+      "src@1111111",
       "--output_manifest"
     ],
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "bot_update",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": \"1111111\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/buildtools\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
@@ skipping 87 matching lines @@
     "cmd": [
       "git",
       "diff",
       "--cached",
       "--name-only"
     ],
     "cwd": "[SLAVE_BUILD]/src",
     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@files@tools/no_benchmark_file@@@",
+      "@@@STEP_LOG_LINE@files@foo.cc@@@",
       "@@@STEP_LOG_END@files@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/src/build/symlink.py",
       "-f",
       "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
@@ skipping 89 matching lines @@
       "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
       "-v",
       "--overwrite-known-devices-files"
     ],
     "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": "device_status",
     "~followup_annotations": [
-      "@@@STEP_TEXT@Online devices: 1@@@",
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@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@      \"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\": \"249\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"voltage\": \"4286\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"blacklisted\": false, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"build_detail\": \"google/razor/flo:5.0/LRX21O/1570415:userdebug/dev-keys\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"imei_slice\": \"Unknown\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"ro.build.id\": \"LRX21O\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"ro.build.product\": \"product_name\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"serial\": \"07a00ca4\", @@@",
-      "@@@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@    \"adb_status\": \"offline\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"blacklisted\": true, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"serial\": \"03e0363a003c6ad4\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"usb_status\": false@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"adb_status\": \"unauthorized\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"blacklisted\": true, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"serial\": \"03e0363a003c6ad5\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"usb_status\": true@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"adb_status\": \"device\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"blacklisted\": true, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"serial\": \"03e0363a003c6ad6\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"usb_status\": true@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@{@@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@  \"adb_status\": \"device\", @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@  \"battery\": {@@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@    \"AC powered\": \"false\", @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@    \"USB powered\": \"true\", @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@    \"Wireless powered\": \"false\", @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@    \"health\": \"2\", @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@    \"level\": \"100\", @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@    \"present\": \"true\", @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@    \"scale\": \"100\", @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@    \"status\": \"5\", @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@    \"technology\": \"Li-ion\", @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@    \"temperature\": \"249\", @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@    \"voltage\": \"4286\"@@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@  }, @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@  \"blacklisted\": false, @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@  \"build_detail\": \"google/razor/flo:5.0/LRX21O/1570415:userdebug/dev-keys\", @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@  \"imei_slice\": \"Unknown\", @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@  \"ro.build.id\": \"LRX21O\", @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@  \"ro.build.product\": \"product_name\", @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@  \"serial\": \"07a00ca4\", @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@  \"usb_status\": true, @@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@  \"wifi_ip\": \"\"@@@",
-      "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@}@@@",
-      "@@@STEP_LOG_END@product_name LRX21O 07a00ca4@@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@{@@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@  \"adb_status\": \"offline\", @@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@  \"blacklisted\": true, @@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@  \"serial\": \"03e0363a003c6ad4\", @@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@  \"usb_status\": false@@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@}@@@",
-      "@@@STEP_LOG_END@03e0363a003c6ad4: missing@@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@{@@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@  \"adb_status\": \"unauthorized\", @@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@  \"blacklisted\": true, @@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@  \"serial\": \"03e0363a003c6ad5\", @@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@  \"usb_status\": true@@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@}@@@",
-      "@@@STEP_LOG_END@03e0363a003c6ad5: adb status unauthorized@@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@{@@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@  \"adb_status\": \"device\", @@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@  \"blacklisted\": true, @@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@  \"serial\": \"03e0363a003c6ad6\", @@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@  \"usb_status\": true@@@",
-      "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@}@@@",
-      "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@"
+      "@@@STEP_TEXT@Online devices: 0@@@",
+      "@@@STEP_LOG_LINE@json.output@[]@@@",
+      "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
       "--action",
       "restart",
       "--pid-file-path",
       "/tmp/device_monitor.pid",
       "--",
       "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",
       "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
-      "[\"07a00ca4\"]",
+      "[]",
       "--blacklist-file",
       "[SLAVE_BUILD]/src/out/bad_devices.json"
     ],
     "name": "spawn_device_monitor"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
       "runhooks"
     ],
     "cwd": "[SLAVE_BUILD]/src",
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "GYP_CHROMIUM_NO_ACTION": "1",
       "GYP_CROSSCOMPILE": "1",
       "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "gclient runhooks"
   },
   {
-    "cmd": [],
-    "name": "Results",
+    "cmd": [
+      "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_status.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "--blacklist-file",
+      "[SLAVE_BUILD]/src/out/bad_devices.json",
+      "--known-devices-file",
+      "[HOME]/.android/known_devices.json",
+      "--buildbot-path",
+      "/home/chrome-bot/.adb_device_info",
+      "--adb-path",
+      "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+      "-v",
+      "--overwrite-known-devices-files"
+    ],
+    "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": "device_status (2)",
     "~followup_annotations": [
-      "@@@STEP_TEXT@There are no modifications to Telemetry benchmarks, aborting the try job.@@@"
+      "@@@STEP_TEXT@Online devices: 0@@@",
+      "@@@STEP_LOG_LINE@json.output@[]@@@",
+      "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--master",
       "tryserver.chromium.perf",
       "--builder",
@@ skipping 10 matching lines @@
       "[GIT_CACHE]",
       "--issue",
       "12853011",
       "--patchset",
       "1",
       "--rietveld_server",
       "https://codereview.chromium.org",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
-      "src@HEAD",
+      "src@1111111",
       "--output_manifest"
     ],
     "env": {
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "bot_update (2)",
     "~followup_annotations": [
       "@@@STEP_TEXT@Some step text@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": \"1111111\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src.git\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/buildtools\": {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"repository\": \"https://fake.org/src/buildtools.git\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"revision\": \"f0319a328b2809876916353cb994259692140934\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }, @@@",
@@ skipping 155 matching lines @@
       "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@",
       "@@@STEP_LOG_LINE@python.inline@  with open(report, 'r') as f:@@@",
       "@@@STEP_LOG_LINE@python.inline@    for l in f.readlines():@@@",
       "@@@STEP_LOG_LINE@python.inline@      print l@@@",
       "@@@STEP_LOG_LINE@python.inline@  os.remove(report)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "name": "$result",
+    "reason": "No Android test devices are available",
     "recipe_result": null,
-    "status_code": 0
+    "status_code": 1
   }
 ]