[Android] Fix failures not being logged on host_info step.

scripts/slave/recipe_modules/chromium_android/api.py

 # Copyright 2013 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 contextlib
 import datetime
 import json
 import os
 import re
 import sys
@@ skipping 353 matching lines @@
 
   def device_status_check(self, restart_usb=False, **kwargs):
     # TODO(bpastene): Remove once chromium revisions prior to
     # crrev.com/1faecde0c03013b6cd725da413339c60223f8948 are no longer tested.
     # See crbug.com/619707 for context.
     self.revert_device_file_format()
     self.device_recovery()
     return self.device_status()
 
   def host_info(self, args=[], **kwargs):
+    results = None
     try:
       with self.handle_exit_codes():
         args.extend(['run', '--output', self.m.json.output()])
         results = self.m.step(
-            'Host_Info',
+            'Host Info',

[jbudorick, 2016/07/29 18:17:41]

This is really the most important part of this patch.

[rnephew (Reviews Here), 2016/07/29 18:44:48]

Acknowledged.

             [self.m.path['checkout'].join('testing', 'scripts',
                                           'host_info.py')] + args,
             env=self.m.chromium.get_env(),
             infra_step=True,
             step_test_data=lambda: self.m.json.test_api.output({
                 'valid': True,
-                'failures': ['Device 3208154b735c5117 blacklisted'],
+                'failures': ['Failure A', 'Failure B'],
                 '_host_info': {
                     'os_system': 'os_system',
                     'os_release': 'os_release',
                     'processor': 'processor',
                     'num_cpus': 'num_cpus',
                     'free_disk_space': 'free_disk_space',
                     'python_version': 'python_version',
                     'python_path': 'python_path',
                     'devices': [{
                         "usb_status": True,
@@ skipping 15 matching lines @@
                         },
                        "adb_status": "device",
                        "imei_slice": "",
                        "ro.build.product": "bullhead",
                        "ro.build.id": "MDB08Q",
                        "serial": "00d0d567893340f4",
                        "wifi_ip": ""
                     }]
                 }}),
             **kwargs)
-      if results.json.output.get('failures'):
-        results.presentation.logs['Failures'] = results.json.output['failures']
       return results
     except self.m.step.InfraFailure:
       pass
+    finally:
+      if results and results.json.output.get('failures'):
+        for failure in results.json.output['failures']:

[jbudorick, 2016/07/29 18:17:41]

optional nit: could do

  if results:
    for failure in results.json.output.get('failures', []):
      ...

[rnephew (Reviews Here), 2016/07/29 18:44:48]

Done.

+          results.presentation.logs[failure] = [failure]
 
   def device_recovery(self, restart_usb=False, **kwargs):
     args = [
         '--blacklist-file', self.blacklist_file,
         '--known-devices-file', self.known_devices_file,
         '--adb-path', self.m.adb.adb_path(),
         '-v'
     ]
     self.m.step(
         'device_recovery',
@@ skipping 1027 matching lines @@
       script = self.c.test_runner
       if wrapper_script_suite_name:
         script = self.m.chromium.output_dir.join('bin', 'run_%s' %
                                                  wrapper_script_suite_name)
       else:
         env = kwargs.get('env', {})
         env['CHROMIUM_OUTPUT_DIR'] = env.get('CHROMIUM_OUTPUT_DIR',
                                              self.m.chromium.output_dir)
         kwargs['env'] = env
       return self.m.python(step_name, script, args, **kwargs)