From ee88e5efedd49e80606ef3007ee6b4e3fc3c9b1e Mon Sep 17 00:00:00 2001 From: Karthikeyan Ramasubramanian Date: Thu, 25 Oct 2018 13:16:07 -0600 Subject: test/ec_sync_test: Add mock test for VB_AUX_FW_NO_DEVICE severity Add a mock test to handle VB_AUX_FW_NO_DEVICE severity BUG=chromium:896451 BRANCH=None TEST=/mnt/host/source/chromite/bin/cros_run_unit_tests --board=octopus --packages=chromeos-base/vboot_reference Change-Id: Ifdabdf3cee1130a8c853d57c278f0e557ebbb96f Signed-off-by: Karthikeyan Ramasubramanian Reviewed-on: https://chromium-review.googlesource.com/1299994 Commit-Ready: ChromeOS CL Exonerator Bot Reviewed-by: Furquan Shaikh Reviewed-by: Julius Werner Reviewed-by: Jett Rink Signed-off-by: Furquan Shaikh Reviewed-on: https://chromium-review.googlesource.com/c/1355748 Commit-Queue: Furquan Shaikh Tested-by: Furquan Shaikh Trybot-Ready: Furquan Shaikh --- tests/ec_sync_tests.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/ec_sync_tests.c b/tests/ec_sync_tests.c index 4c1775f2..4b01b64a 100644 --- a/tests/ec_sync_tests.c +++ b/tests/ec_sync_tests.c @@ -219,8 +219,10 @@ VbError_t VbExCheckAuxFw(VbAuxFwUpdateSeverity_t *severity) VbError_t VbExUpdateAuxFw() { - ec_aux_fw_update_req = ec_aux_fw_update_severity != VB_AUX_FW_NO_UPDATE; - ec_aux_fw_protected = 1; + if (ec_aux_fw_update_severity != VB_AUX_FW_NO_DEVICE && + ec_aux_fw_update_severity != VB_AUX_FW_NO_UPDATE) + ec_aux_fw_update_req = 1; + ec_aux_fw_protected = ec_aux_fw_update_severity != VB_AUX_FW_NO_DEVICE; return ec_aux_fw_retval; } @@ -404,6 +406,15 @@ static void VbSoftwareSyncTest(void) TEST_EQ(ec_aux_fw_update_req, 0, " aux fw update disabled"); TEST_EQ(ec_aux_fw_protected, 1, " aux fw protected"); + ResetMocks(); + ec_aux_fw_mock_severity = VB_AUX_FW_NO_DEVICE; + test_ssync(VBERROR_SUCCESS, 0, + "No auxiliary FW update needed"); + TEST_EQ(screens_count, 0, + " wait screen skipped"); + TEST_EQ(ec_aux_fw_update_req, 0, " no aux fw update requested"); + TEST_EQ(ec_aux_fw_protected, 0, " no aux fw protected"); + ResetMocks(); ec_aux_fw_mock_severity = VB_AUX_FW_NO_UPDATE; test_ssync(VBERROR_SUCCESS, 0, -- cgit v1.2.1