[Android] Make host_info.py use device_status.py instead of bb_device_status_check.py

testing/scripts/host_info.py

 #!/usr/bin/env python
 # Copyright 2015 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.
 
 import json
 import multiprocessing
 import os
 import platform
 import subprocess
 import sys
 
+import common
 
-import common
+
+INFRA_EXIT_CODE = 87

[Paweł Hajdan Jr., 2016/07/04 10:38:08]

Can we move that to testing/scripts/common? I'd also suggest rename to
INFRA_FAILURE_EXIT_CODE.

[rnephew (Reviews Here), 2016/07/06 15:37:09]

Done.

 
 
 def is_linux():
   return sys.platform.startswith('linux')
 
 
 def get_free_disk_space(failures):
   """Returns the amount of free space on the current disk, in GiB.
 
   Returns:
@@ skipping 29 matching lines @@
   Returns:
     A dict indicating the result.
   """
   if not is_linux():
     return {}
 
   with common.temporary_file() as tempfile_path:
     rc = common.run_command([
         sys.executable,
         os.path.join(args.paths['checkout'],
-                     'build',
+                     'third_party',
+                     'catapult',
+                     'devil',
+                     'devil',
                      'android',
-                     'buildbot',
-                     'bb_device_status_check.py'),
+                     'tools',
+                     'device_status.py'),
         '--json-output', tempfile_path,
         '--blacklist-file', os.path.join(
             args.paths['checkout'], 'out', 'bad_devices.json')])
 
     if rc:
-      failures.append('bb_device_status_check')
+      failures.append('device_status')
       return {}
 
     with open(tempfile_path, 'r') as src:
       device_info = json.load(src)
 
   results = {}
   results['devices'] = sorted(v['serial'] for v in device_info)
 
-  details = [v['build_detail'] for v in device_info if not v['blacklisted']]
+  details = [
+      v['ro.build.fingerprint'] for v in device_info if not v['blacklisted']]
 
   def unique_build_details(index):
     return sorted(list(set([v.split(':')[index] for v in details])))
 
   parsed_details = {
     'device_names': unique_build_details(0),
     'build_versions': unique_build_details(1),
     'build_types': unique_build_details(2),
   }
 
@@ skipping 26 matching lines @@
   host_info['python_path'] = sys.executable
 
   host_info['devices'] = get_device_info(args, failures)
 
   json.dump({
       'valid': True,
       'failures': failures,
       '_host_info': host_info,
   }, args.output)
 
-  return len(failures) != 0
+  if len(failures) != 0:
+    return INFRA_EXIT_CODE
+  return 0
 
 
 def main_compile_targets(args):
   json.dump([], args.output)
 
 
 if __name__ == '__main__':
   funcs = {
     'run': main_run,
     'compile_targets': main_compile_targets,
   }
   sys.exit(common.run_script(sys.argv[1:], funcs))