faft: Change the order of setup_dev_mode() and setting dut_sees_usbkey
In the keyboard controlled dev mode, the dev mode switching method may
plug out the USB disk from DUT. It changes the original USB plug in/out
setting. So we should set the USB plug in/out after setup_dev_mode().
BUG=chrome-os-partner:11694
TEST=DUT in normal mode, run firmware_RecoveryButton/control.dev passed.
Change-Id: If1461b94994ed1a7e2eff7a9023e77e40f28be4a
Reviewed-on: https://gerrit.chromium.org/gerrit/28466
Reviewed-by: Vic Yang <victoryang@chromium.org>
Commit-Ready: Tom Wai-Hong Tam <waihong@chromium.org>
Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>
diff --git a/server/site_tests/firmware_CorruptBothFwBodyAB/firmware_CorruptBothFwBodyAB.py b/server/site_tests/firmware_CorruptBothFwBodyAB/firmware_CorruptBothFwBodyAB.py
index e561cb4..0ac04a6 100644
--- a/server/site_tests/firmware_CorruptBothFwBodyAB/firmware_CorruptBothFwBodyAB.py
+++ b/server/site_tests/firmware_CorruptBothFwBodyAB/firmware_CorruptBothFwBodyAB.py
@@ -45,11 +45,11 @@
if (self.faft_client.get_firmware_flags('a') &
self.PREAMBLE_USE_RO_NORMAL):
self.use_ro = True
- self.servo.set('usb_mux_sel1', 'servo_sees_usbkey')
+ self.setup_dev_mode(dev_mode)
else:
self.assert_test_image_in_usb_disk()
+ self.setup_dev_mode(dev_mode)
self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
- self.setup_dev_mode(dev_mode)
def cleanup(self):
diff --git a/server/site_tests/firmware_CorruptBothFwSigAB/firmware_CorruptBothFwSigAB.py b/server/site_tests/firmware_CorruptBothFwSigAB/firmware_CorruptBothFwSigAB.py
index af20c7b..c20be11 100644
--- a/server/site_tests/firmware_CorruptBothFwSigAB/firmware_CorruptBothFwSigAB.py
+++ b/server/site_tests/firmware_CorruptBothFwSigAB/firmware_CorruptBothFwSigAB.py
@@ -35,8 +35,8 @@
def setup(self, dev_mode=False):
super(firmware_CorruptBothFwSigAB, self).setup()
self.assert_test_image_in_usb_disk()
- self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
self.setup_dev_mode(dev_mode)
+ self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
def cleanup(self):
diff --git a/server/site_tests/firmware_CorruptBothKernelAB/firmware_CorruptBothKernelAB.py b/server/site_tests/firmware_CorruptBothKernelAB/firmware_CorruptBothKernelAB.py
index bfb518a..70f85f3 100644
--- a/server/site_tests/firmware_CorruptBothKernelAB/firmware_CorruptBothKernelAB.py
+++ b/server/site_tests/firmware_CorruptBothKernelAB/firmware_CorruptBothKernelAB.py
@@ -38,9 +38,9 @@
def setup(self, dev_mode=False):
super(firmware_CorruptBothKernelAB, self).setup()
self.assert_test_image_in_usb_disk()
- self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
self.setup_dev_mode(dev_mode)
self.setup_kernel('a')
+ self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
def cleanup(self):
diff --git a/server/site_tests/firmware_DevTriggerRecovery/firmware_DevTriggerRecovery.py b/server/site_tests/firmware_DevTriggerRecovery/firmware_DevTriggerRecovery.py
index f726e99..146d793 100644
--- a/server/site_tests/firmware_DevTriggerRecovery/firmware_DevTriggerRecovery.py
+++ b/server/site_tests/firmware_DevTriggerRecovery/firmware_DevTriggerRecovery.py
@@ -62,8 +62,8 @@
def setup(self):
super(firmware_DevTriggerRecovery, self).setup()
self.assert_test_image_in_usb_disk()
- self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
self.setup_dev_mode(dev_mode=False)
+ self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
def run_once(self, host=None):
diff --git a/server/site_tests/firmware_InvalidUSB/firmware_InvalidUSB.py b/server/site_tests/firmware_InvalidUSB/firmware_InvalidUSB.py
index c007216..e8f1654 100644
--- a/server/site_tests/firmware_InvalidUSB/firmware_InvalidUSB.py
+++ b/server/site_tests/firmware_InvalidUSB/firmware_InvalidUSB.py
@@ -49,8 +49,8 @@
usb_dev = self.servo.probe_host_usb_dev()
self.assert_test_image_in_usb_disk(usb_dev)
self.corrupt_usb_kernel(usb_dev)
- self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
self.setup_dev_mode(dev_mode=False)
+ self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
def cleanup(self):
diff --git a/server/site_tests/firmware_RecoveryButton/firmware_RecoveryButton.py b/server/site_tests/firmware_RecoveryButton/firmware_RecoveryButton.py
index dd63e1d..34fc0c5 100644
--- a/server/site_tests/firmware_RecoveryButton/firmware_RecoveryButton.py
+++ b/server/site_tests/firmware_RecoveryButton/firmware_RecoveryButton.py
@@ -33,8 +33,8 @@
def setup(self, dev_mode=False):
super(firmware_RecoveryButton, self).setup()
self.assert_test_image_in_usb_disk()
- self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
self.setup_dev_mode(dev_mode)
+ self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
def cleanup(self):
diff --git a/server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py b/server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py
index 837c1f1..963c1a1 100644
--- a/server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py
+++ b/server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py
@@ -34,8 +34,8 @@
def setup(self, dev_mode=False):
super(firmware_RollbackFirmware, self).setup()
self.assert_test_image_in_usb_disk()
- self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
self.setup_dev_mode(dev_mode)
+ self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
def cleanup(self):
diff --git a/server/site_tests/firmware_RollbackKernel/firmware_RollbackKernel.py b/server/site_tests/firmware_RollbackKernel/firmware_RollbackKernel.py
index 38721b8..5c17093 100644
--- a/server/site_tests/firmware_RollbackKernel/firmware_RollbackKernel.py
+++ b/server/site_tests/firmware_RollbackKernel/firmware_RollbackKernel.py
@@ -38,9 +38,9 @@
def setup(self, dev_mode=False):
super(firmware_RollbackKernel, self).setup()
self.assert_test_image_in_usb_disk()
- self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
self.setup_dev_mode(dev_mode)
self.setup_kernel('a')
+ self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
def cleanup(self):
diff --git a/server/site_tests/firmware_UserRequestRecovery/firmware_UserRequestRecovery.py b/server/site_tests/firmware_UserRequestRecovery/firmware_UserRequestRecovery.py
index 86bd69d..0600e96 100644
--- a/server/site_tests/firmware_UserRequestRecovery/firmware_UserRequestRecovery.py
+++ b/server/site_tests/firmware_UserRequestRecovery/firmware_UserRequestRecovery.py
@@ -32,8 +32,8 @@
def setup(self, dev_mode=False):
super(firmware_UserRequestRecovery, self).setup()
self.assert_test_image_in_usb_disk()
- self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
self.setup_dev_mode(dev_mode)
+ self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
def cleanup(self):