[Android] Reland splitting of device recovery and device status.

scripts/slave/recipe_modules/chromium_android/example.py

 # Copyright 2014 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.
 
 from recipe_engine.types import freeze
 
 DEPS = [
     'adb',
     'chromium',
     'chromium_android',
@@ skipping 138 matching lines @@
   if config.get('specific_install'):
     api.chromium_android.adb_install_apk('Chrome.apk', devices=['abc123'])
 
   api.adb.root_devices()
   api.chromium_android.spawn_logcat_monitor()
 
   failure = False
   try:
     # TODO(luqui): remove redundant cruft, need one consistent API.
     api.chromium_android.detect_and_setup_devices()
+    api.chromium_android.device_status_check()
 
     api.path.mock_add_paths(api.chromium_android.known_devices_file)
     api.chromium_android.device_status_check(
       restart_usb=config.get('restart_usb', False))
 
     api.chromium_android.provision_devices(
         skip_wipe=config.get('skip_wipe', False),
         disable_location=config.get('disable_location', False),
         min_battery_level=config.get('min_battery_level'),
         max_battery_temp=config.get('max_battery_temp'),
@@ skipping 73 matching lines @@
         slavename='tehslave',
         repo_name='src/repo',
         patch_url='https://the.patch.url/the.patch',
         repo_url='svn://svn.chromium.org/chrome/trunk/src',
         revision='4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00',
         internal=True)
 
   for buildername in BUILDERS:
     yield api.test('%s_basic' % buildername) + properties_for(buildername)
 
-  yield (api.test('tester_no_devices') +
+  yield (api.test('tester_no_devices_during_recovery') +
          properties_for('tester') +
-         api.step_data('device_status_check', retcode=1))
+         api.step_data('device_recovery', retcode=1))
 
-  yield (api.test('tester_other_device_failure') +
+  yield (api.test('tester_no_devices_during_status') +
          properties_for('tester') +
-         api.step_data('device_status_check', retcode=2))
+         api.step_data('device_status', retcode=1))
+
+  yield (api.test('tester_other_device_failure_during_recovery') +
+         properties_for('tester') +
+         api.step_data('device_recovery', retcode=2))
+
+  yield (api.test('tester_other_device_failure_during_status') +
+         properties_for('tester') +
+         api.step_data('device_status', retcode=2))
 
   yield (api.test('tester_with_step_warning') +
          properties_for('tester') +
          api.step_data('unittests', retcode=88))
 
   yield (api.test('tester_blacklisted_devices') +
          properties_for('tester') +
          api.override_step_data('provision_devices',
                                 api.json.output(['abc123', 'def456'])))
 
   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') +
       properties_for('perf_runner') +
       api.step_data('perf_test.foo', retcode=1))
 
   yield (api.test('gerrit_refs') +
       api.properties.generic(
         buildername='gerrit_try_builder',
         slavename='testslave',
@@ skipping 102 matching lines @@
 
   yield (api.test('device_file_format_mismatch') +
          properties_for('tester') +
          api.override_step_data('fix_device_file_format.read_device_file', 
              api.raw_io.output('["device1", "device2"]')))
 
   yield (api.test('tombstones_m53') +
          properties_for('tester') +
          api.override_step_data('get version (2)',
              api.raw_io.output('MAJOR=53\nMINOR=0\nBUILD=2800\nPATCH=0\n')))