Chromium Code Reviews| Index: scripts/slave/recipe_modules/chromium_android/api.py |
| diff --git a/scripts/slave/recipe_modules/chromium_android/api.py b/scripts/slave/recipe_modules/chromium_android/api.py |
| index 39fe915419d05d1e553c2157dd37352e656e41b2..9011485bf075d0d7af6cb330bd95225bf14a0e36 100644 |
| --- a/scripts/slave/recipe_modules/chromium_android/api.py |
| +++ b/scripts/slave/recipe_modules/chromium_android/api.py |
| @@ -371,18 +371,19 @@ class AndroidApi(recipe_api.RecipeApi): |
| 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 pat
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', |
| @@ -418,11 +419,13 @@ class AndroidApi(recipe_api.RecipeApi): |
| }] |
| }}), |
| **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 fail
rnephew (Reviews Here)
2016/07/29 18:44:48
Done.
|
| + results.presentation.logs[failure] = [failure] |
| def device_recovery(self, restart_usb=False, **kwargs): |
| args = [ |