commit 57c059860b30cf3e9cde1940e9d02e0477c92694
author Daisuke Nojiri <dnojiri@chromium.org> Wed Jun 25 15:28:35 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Jul 08 04:28:27 2014 +0000
tree eaf25b5bec3b4a05950fa778d4572d3358328f83
parent d98cf57480695da698e010ce523c1488eff8ada4

vboot2: adjust expectation based on the new firmware selection behavior

vboot2 selects firmware based on fw_try_next value and continues to use the slot
until the next update. Autoupdate uses whichever inactive slot to try out a new
image while vboot1 always writes a new image to slot B.

TEST=Ran firmware_* tests against Blaze with USE=+/-vboot2.
BUG=none
BRANCH=none
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>

Change-Id: I586235bcc5ca52282fe9652b51e5dd311b4fac4c
Reviewed-on: https://chromium-review.googlesource.com/205988
Reviewed-by: Wai-Hong Tam <waihong@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>

server/cros/faft/firmware_test.py

diff --git a/server/cros/faft/firmware_test.py b/server/cros/faft/firmware_test.py
index 3cfdd75..01b0966 100644
--- a/server/cros/faft/firmware_test.py
+++ b/server/cros/faft/firmware_test.py
@@ -172,6 +172,8 @@
         self._setup_gbb_flags()
         self._stop_service('update-engine')
         self._setup_ec_write_protect(ec_wp)
+        self.fw_vboot2 = self.faft_client.system.get_fw_vboot2()
+        logging.info('vboot version: %d', 2 if self.fw_vboot2 else 1)
         # See chromium:239034 regarding needing this sync.
         self.faft_client.system.run_shell_command('sync')
         time.sleep(self.faft_config.sync)