commit b3c11f39442949345d38ee3473c9cb51011c62e5
author Kalin Stoyanov <kalin@chromium.org> Fri May 11 09:02:00 2018 -0700
committer chrome-bot <chrome-bot@chromium.org> Fri May 11 23:22:30 2018 -0700
tree a737a832958c8458d3c574312788e008a5cc2f91
parent 497d6add2f71a45c6f4fdbf2b2597e0a5cc09b5a

Add stage and recover (to same build) test

BUG=chromium:716225
Test=Staging successfully tested. Copy image to servo USB and recovery
to be tested on selected lab board after checked-in.

Change-Id: Ia55842616c0e5957f5788c095f1471fb2685618e
Reviewed-on: https://chromium-review.googlesource.com/1055620
Commit-Ready: Kalin Stoyanov <kalin@chromium.org>
Tested-by: Kalin Stoyanov <kalin@chromium.org>
Reviewed-by: danny chan <dchan@chromium.org>

server/cros/servo/servo.py

diff --git a/server/cros/servo/servo.py b/server/cros/servo/servo.py
index 3b317d1..aca0582 100644
--- a/server/cros/servo/servo.py
+++ b/server/cros/servo/servo.py
@@ -623,6 +623,11 @@
                     logging.error('Failed to make image noninteractive. '
                                   'Please take a look at Servo Logs.')
 
+    def boot_in_recovery_mode(self):
+        """Boot host DUT in recovery mode."""
+        self._power_state.power_on(rec_mode=self._power_state.REC_ON)
+        self.switch_usbkey('dut')
+
 
     def install_recovery_image(self, image_path=None,
                                make_image_noninteractive=False):
@@ -639,8 +644,7 @@
                 after installation.
         """
         self.image_to_servo_usb(image_path, make_image_noninteractive)
-        self._power_state.power_on(rec_mode=self._power_state.REC_ON)
-        self.switch_usbkey('dut')
+        self.boot_in_recovery_mode()
 
 
     def _scp_image(self, image_path):