commit 4fe63805587d71ae8a5bc0c1dd485d92096d054c
author Lenine Ajagappane <leninex.ajagappane@intel.com> Wed Dec 06 18:05:47 2017 +0530
committer chrome-bot <chrome-bot@chromium.org> Wed Dec 13 12:33:40 2017 -0800
tree 93d79cc2e51aedfc8509f085cf9930f1036c1363
parent 7d574e00bfab2485103fc30aa0a0f299909d52fd

FAFT: Switch to Normal mode before setup shellball

firmware_UpdateFirmwareDataKeyVersion test is failing when test
initiated from Developer mode (GBB-0x140), hence switching to
Normal mode before executing shellball.

BUG=b:65809133
BRANCH=none
TEST=Ran the firmware_UpdateFirmwareDataKeyVersion test in
Developer mode on Soraka board, test is passing.

Change-Id: I3088f5a119b5f250fa75c376d6a9fb28867c8ca1
Signed-off-by: Lenine Ajagappane <leninex.ajagappane@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/810565
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Wai-Hong Tam <waihong@google.com>

server/site_tests/firmware_UpdateFirmwareDataKeyVersion/firmware_UpdateFirmwareDataKeyVersion.py

diff --git a/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/firmware_UpdateFirmwareDataKeyVersion.py b/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/firmware_UpdateFirmwareDataKeyVersion.py
index a7ec63b..89dbdd0 100644
--- a/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/firmware_UpdateFirmwareDataKeyVersion.py
+++ b/server/site_tests/firmware_UpdateFirmwareDataKeyVersion/firmware_UpdateFirmwareDataKeyVersion.py
@@ -55,6 +55,7 @@
         super(firmware_UpdateFirmwareDataKeyVersion, self).initialize(
             host, cmdline_args)
         self.backup_firmware()
+        self.switcher.setup_mode('normal')
         self.setup_firmwareupdate_shellball(shellball_path)
 
         # Update firmware if needed
@@ -64,7 +65,6 @@
             self.switcher.mode_aware_reboot()
 
         self.setup_usbkey(usbkey=True)
-        self.switcher.setup_mode('normal')
         self._fwid = self.faft_client.updater.get_fwid()
 
         actual_ver = self.faft_client.bios.get_datakey_version('a')