[Android] Add failures to results log line for 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 402 matching lines @@
                        "adb_status": "device",
                        "imei_slice": "",
                        "ro.build.product": "bullhead",
                        "ro.build.id": "MDB08Q",
                        "serial": "00d0d567893340f4",
                        "wifi_ip": ""
                     }]
                 }}),
             **kwargs)
       return results
-    except self.m.step.InfraFailure:
-      pass
-    finally:
-      if results:
-        for failure in results.json.output.get('failures', []):
-          results.presentation.logs[failure] = [failure]
+    except self.m.step.InfraFailure as f:
+      for failure in f.result.json.output.get('failures', []):
+        f.result.presentation.logs[failure] = [failure]
+      f.result.presentation.status = self.m.step.FAILURE

[jbudorick, 2016/08/01 23:29:21]

Will this turn the step red rather than purple?

[martiniss, 2016/08/02 00:44:29]

yes

[rnephew (Reviews Here), 2016/08/02 01:03:49]

c/p the wrong line. Fixed.

 
   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)