[Android] Move to new device status and recovery scripts.

scripts/slave/recipes/mojo.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 DEPS = [
   'depot_tools/bot_update',
   'depot_tools/gclient',
   'recipe_engine/json',
   'recipe_engine/path',
   'recipe_engine/platform',
@@ skipping 49 matching lines @@
              args=['gn', build_type] + args + gn_args,
              cwd=api.path['checkout'],
              env=env)
   api.python('mojob build',
              mojob_path,
              args=['build', build_type] + args,
              env=env)
 
 
 def _DeviceCheckStep(api):
-  devices_path = api.m.path['build'].join('site_config', '.known_devices')
+
+  known_devices_path = api.m.path['build'].join('site_config', '.known_devices')
+  # Device Recovery
   args = [
-      '--json-output', api.json.output(),
-      '--restart-usb',
-      '--known-devices-file', devices_path,
+      '--known-devices-file', known_devices_path,
+      '-v'
   ]
+  api.m.step(
+      'device_recovery',
+      [api.m.path['checkout'].join('third_party', 'catapult', 'devil',

[jbudorick, 2016/06/24 14:40:47]

:(

Same comment about --adb-path, though.

[rnephew (Reviews Here), 2016/06/24 17:35:06]

Done.

After this lands, I'm going to work more on unifying them to use the same recipe
module. I dont know how hard that will be, but I think in the long run its the
correct thing to do.

+                                    'devil', 'android', 'tools',
+                                    'device_recovery.py')] + args,
+      infra_step=True,)
+  # Device provisioning
+  api.python(
+      'provision_device',
+      api.path['checkout'].join('build', 'android', 'provision_devices.py'),
+      infra_step=True)
+  # Device status check
   try:
+    buildbot_file = '/home/chrome-bot/.adb_device_info'
+    args = [
+        '--json-output', api.m.json.output(),
+        '--known-devices-file', known_devices_path,
+        '--buildbot-path', buildbot_file,
+        '-v', '--overwrite-known-devices-files',
+    ]
+
     result = api.python(
-        'device_status_check',
-        api.path['checkout'].join('build', 'android', 'buildbot',
-                              'bb_device_status_check.py'),
+        'device_status',
+        api.path['checkout'].join('third_party', 'catapult', 'devil', 'devil',
+                                  'android', 'buildbot', 'device_status.py'),
         args=args,
         infra_step=True)
-    devices = [d['serial'] for d in result.json.output]
+
+    devices = []
+    offline_device_index = 1
+    for d in result.json.output:
+      try:
+        if not d['usb_status']:
+          key = '%s: missing' % d['serial']
+        elif d['adb_status'] != 'device':
+          key = '%s: adb status %s' % (d['serial'], d['adb_status'])
+        elif d['blacklisted']:
+          key = '%s: blacklisted' % d['serial']
+        else:
+          key = '%s %s %s' % (d['type'], d['build'], d['serial'])
+          devices.append(d['serial'])
+      except KeyError:
+        key = 'unknown device %d' % offline_device_index
+        offline_device_index += 1
+      result.presentation.logs[key] = api.m.json.dumps(
+          d, indent=2).splitlines()
     result.presentation.step_text = 'Online devices: %s' % len(devices)
+    return result
   except api.step.InfraFailure as f:
     params = {
       'summary': ('Device Offline on %s %s' %
                    (api.properties['mastername'], api.properties['slavename'])),
       'comment': ('Buildbot: %s\n(Please do not change any labels)' %
                    api.properties['buildername']),
       'labels': 'Restrict-View-Google,OS-Android,Infra-Client,Infra-Labs',
     }
     link = ('https://code.google.com/p/chromium/issues/entry?%s' %
       api.url.urlencode(params))
     f.result.presentation.links.update({
       'report a bug': link
     })
     raise
 
-  api.python(
-      'provision_device',
-      api.path['checkout'].join('build', 'android', 'provision_devices.py'),
-      infra_step=True)
-
-
 def _GetTestConfig(api):
   buildername = api.properties.get('buildername')
 
   test_config = {}
   if 'Android' in buildername:
     test_config['target_os'] = 'android'
   elif 'Linux' in buildername:
     test_config['target_os'] = 'linux'
   elif 'Win' in buildername:
     test_config['target_os'] = 'windows'
@@ skipping 99 matching lines @@
       ['mojo_android_builder', 'Mojo Android Builder'],
       ['mojo_android_official', 'Mojo Android Official Builder'],
       ['mojo_android_dbg', 'Mojo Android (dbg)'],
       ['mojo_android_builder_tests_dbg', 'Mojo Android Builder Tests (dbg)'],
       ['mojo_win_dbg', 'Mojo Win (dbg)'],
       ['mojo_linux_perf', 'Mojo Linux Perf']
   ]
   for test_name, buildername in tests:
     test = api.test(test_name) + api.properties.generic(buildername=buildername)
     if 'Android' in buildername and 'Tests' in buildername:
-      test += api.step_data("device_status_check", api.json.output([{
-              "battery": {
-                  "status": "5",
-                  "scale": "100",
-                  "temperature": "249",
-                  "level": "100",
-                  "AC powered": "false",
-                  "health": "2",
-                  "voltage": "4286",
-                  "Wireless powered": "false",
-                  "USB powered": "true",
-                  "technology": "Li-ion",
-                  "present": "true"
-              },
-              "wifi_ip": "",
-              "imei_slice": "Unknown",
-              "build": "LRX21O",
-              "build_detail":
-                  "google/razor/flo:5.0/LRX21O/1570415:userdebug/dev-keys",
-              "serial": "07a00ca4",
-              "type": "flo"
-          }]))
+      test += api.step_data("device_status", api.json.output([
+          {
+            "battery": {
+                "status": "5",
+                "scale": "100",
+                "temperature": "249",
+                "level": "100",
+                "AC powered": "false",
+                "health": "2",
+                "voltage": "4286",
+                "Wireless powered": "false",
+                "USB powered": "true",
+                "technology": "Li-ion",
+                "present": "true"
+            },
+            "wifi_ip": "",
+            "imei_slice": "Unknown",
+            "build": "LRX21O",
+            "build_detail":
+                "google/razor/flo:5.0/LRX21O/1570415:userdebug/dev-keys",
+            "serial": "07a00ca4",
+            "type": "flo",
+            "adb_status": "device",
+            "blacklisted": False,
+            "usb_status": True,
+        },
+        {
+          "adb_status": "offline",
+          "blacklisted": True,
+          "serial": "03e0363a003c6ad4",
+          "usb_status": False,
+        },
+        {
+          "adb_status": "unauthorized",
+          "blacklisted": True,
+          "serial": "03e0363a003c6ad5",
+          "usb_status": True,
+        },
+        {
+          "adb_status": "device",
+          "blacklisted": True,
+          "serial": "03e0363a003c6ad6",
+          "usb_status": True,
+        },
+        {}
+      ]))
     yield test
   yield(api.test('mojo_linux_try') +
       api.properties.tryserver(buildername="Mojo Linux Try"))
   yield(api.test('mojo_android_builder_tests_dbg_fail_device_check') +
       api.properties.tryserver(buildername="Mojo Android Builder Tests (dbg)") +
-      api.step_data("device_status_check", retcode=1))
+      api.step_data("device_status", retcode=1))