Chromium Code Reviews| Index: scripts/slave/recipe_modules/chromium_android/example.py |
| diff --git a/scripts/slave/recipe_modules/chromium_android/example.py b/scripts/slave/recipe_modules/chromium_android/example.py |
| index 821583cb09001c21ce5ab87cbc8656e76ad45abc..425a7ebd973729d97edbb4a094e7d9a0461aa283 100644 |
| --- a/scripts/slave/recipe_modules/chromium_android/example.py |
| +++ b/scripts/slave/recipe_modules/chromium_android/example.py |
| @@ -148,12 +148,10 @@ def RunSteps(api, buildername): |
| failure = False |
| try: |
| - # TODO(luqui): remove redundant cruft, need one consistent API. |
| + # detect_and_setup_devices contains device recovery, provisiong, and status. |
| api.chromium_android.detect_and_setup_devices() |
| - |
| - api.chromium_android.device_status_check( |
| - restart_usb=config.get('restart_usb', False)) |
| - |
| + api.chromium_android.device_status_check() |
| + # Needed to test all flags to provision devices. |
| api.chromium_android.provision_devices( |
| skip_wipe=config.get('skip_wipe', False), |
| disable_location=config.get('disable_location', False), |
| @@ -163,6 +161,7 @@ def RunSteps(api, buildername): |
| remove_system_webview=config.get('remove_system_webview', False), |
| disable_system_chrome=config.get('disable_system_chrome', False)) |
| + |
|
jbudorick
2016/06/15 14:05:38
?
rnephew (Reviews Here)
2016/06/15 16:05:13
Done.
|
| except api.step.StepFailure as f: |
| failure = f |
| @@ -242,11 +241,11 @@ def GenTests(api): |
|
jbudorick
2016/06/15 14:05:38
I would expect some of these to fail in recovery.
rnephew (Reviews Here)
2016/06/15 16:05:13
Done.
|
| yield (api.test('tester_no_devices') + |
| properties_for('tester') + |
| - api.step_data('device_status_check', retcode=1)) |
| + api.step_data('device_status', retcode=1)) |
| yield (api.test('tester_other_device_failure') + |
| properties_for('tester') + |
| - api.step_data('device_status_check', retcode=2)) |
| + api.step_data('device_status', retcode=2)) |
| yield (api.test('tester_with_step_warning') + |
| properties_for('tester') + |
| @@ -259,7 +258,7 @@ def GenTests(api): |
| yield (api.test('tester_offline_devices') + |
| properties_for('tester') + |
| - api.override_step_data('device_status_check', |
| + api.override_step_data('device_status', |
| api.json.output([{}, {}]))) |
| yield (api.test('perf_tests_failure') + |