commit 1e7f1edbf47187d4e4b3b8878ede4522de93f26a
author Tom Wai-Hong Tam <waihong@chromium.org> Thu Oct 18 17:03:13 2012 +0800
committer Gerrit <chrome-bot@google.com> Thu Oct 18 10:05:43 2012 -0700
tree 95610332949eb9992b22d605d089f4b5c034542b
parent 87df9932d281d5db1cbe9779eb049925424f46ea

faft: Speed up by moving the GBB flag setup to FAFTSequence

We now check/change GBB flags only on the first test of the test suite.
Moving all the required GBB flag change in FAFTSequence can save time for
duplicate check/change.

BUG=chromium-os:34392
TEST=run_remote_tests.sh --board daisy --remote dut DevScreenTimeout \
     RollbackFirmware/control$

Change-Id: I8417e5e1c79a8e7b18fadf54ec75c736dfcdcafd
Reviewed-on: https://gerrit.chromium.org/gerrit/35940
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>

server/cros/faftsequence.py

diff --git a/server/cros/faftsequence.py b/server/cros/faftsequence.py
index ec7e36c..9cb9559 100644
--- a/server/cros/faftsequence.py
+++ b/server/cros/faftsequence.py
@@ -184,7 +184,8 @@
         })
         self.clear_set_gbb_flags(vboot.GBB_FLAG_DEV_SCREEN_SHORT_DELAY |
                                  vboot.GBB_FLAG_FORCE_DEV_SWITCH_ON |
-                                 vboot.GBB_FLAG_FORCE_DEV_BOOT_USB,
+                                 vboot.GBB_FLAG_FORCE_DEV_BOOT_USB |
+                                 vboot.GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK,
                                  vboot.GBB_FLAG_ENTER_TRIGGERS_TONORM)
         if self._install_image_path:
             self.install_test_image(self._install_image_path,

server/site_tests/firmware_DevScreenTimeout/firmware_DevScreenTimeout.py

diff --git a/server/site_tests/firmware_DevScreenTimeout/firmware_DevScreenTimeout.py b/server/site_tests/firmware_DevScreenTimeout/firmware_DevScreenTimeout.py
index d7aaeb1..221a8c9 100644
--- a/server/site_tests/firmware_DevScreenTimeout/firmware_DevScreenTimeout.py
+++ b/server/site_tests/firmware_DevScreenTimeout/firmware_DevScreenTimeout.py
@@ -6,7 +6,6 @@
 import time
 
 from autotest_lib.client.common_lib import error
-from autotest_lib.server.cros import vboot_constants as vboot
 from autotest_lib.server.cros.faftsequence import FAFTSequence
 
 
@@ -86,8 +85,6 @@
         super(firmware_DevScreenTimeout, self).setup()
         # This test is run on developer mode only.
         self.setup_dev_mode(dev_mode=True)
-        # Clear the short delay flag to verify the release behavior.
-        self.clear_set_gbb_flags(vboot.GBB_FLAG_DEV_SCREEN_SHORT_DELAY, 0)
 
 
     def run_once(self, host=None):

server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py

diff --git a/server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py b/server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py
index add55cd..32b6a3c 100644
--- a/server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py
+++ b/server/site_tests/firmware_RollbackFirmware/firmware_RollbackFirmware.py
@@ -24,7 +24,6 @@
         self.assert_test_image_in_usb_disk()
         self.setup_dev_mode(dev_mode)
         self.servo.set('usb_mux_sel1', 'dut_sees_usbkey')
-        self.clear_set_gbb_flags(vboot.GBB_FLAG_DISABLE_FW_ROLLBACK_CHECK, 0)
 
 
     def cleanup(self):