summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarthikeyan Ramasubramanian <kramasub@google.com>2021-12-16 17:32:21 -0700
committerCommit Bot <commit-bot@chromium.org>2021-12-23 09:22:15 +0000
commitf2c41528b1324c9c546e0b59b73bfe6e3b98e7b7 (patch)
tree3fe01662eafd7d25b9eb4a9b254bbee609498bcb
parent60c5cd5955ca89c24c6d1018da8fa2388a42b14c (diff)
downloadvboot-f2c41528b1324c9c546e0b59b73bfe6e3b98e7b7.tar.gz
tests/vb2_auxfw_sync_tests: Match the test behavior with the device
In depthcharge, display availability is checked as part of performing AUX FW update. In vboot tests, display availability is checked as part of checking for the AUX FW update. Match the test behavior with the implementation in depthcharge. BUG=b:210127173 BRANCH=None TEST=Ensure that all the tests passed successfully using the following command: cros_workon_make --board=dedede vboot_reference --test Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com> Change-Id: Ifc58f94bd64c3a90f80e40d97de8938a04dcba6f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3346284 Tested-by: Karthikeyan Ramasubramanian <kramasub@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Yu-Ping Wu <yupingso@chromium.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Commit-Queue: Bob Moragues <moragues@chromium.org>
-rw-r--r--tests/vb2_auxfw_sync_tests.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/vb2_auxfw_sync_tests.c b/tests/vb2_auxfw_sync_tests.c
index 3987d64f..bcdd67a8 100644
--- a/tests/vb2_auxfw_sync_tests.c
+++ b/tests/vb2_auxfw_sync_tests.c
@@ -65,14 +65,15 @@ vb2_error_t vb2ex_auxfw_check(enum vb2_auxfw_update_severity *severity)
{
*severity = auxfw_mock_severity;
auxfw_update_severity = auxfw_mock_severity;
- if (*severity == VB2_AUXFW_SLOW_UPDATE)
- if (!auxfw_mock_display_available)
- return VB2_REQUEST_REBOOT;
return VB2_SUCCESS;
}
vb2_error_t vb2ex_auxfw_update(void)
{
+ if (auxfw_update_severity == VB2_AUXFW_SLOW_UPDATE)
+ if (!auxfw_mock_display_available)
+ return VB2_REQUEST_REBOOT;
+
if (auxfw_update_severity != VB2_AUXFW_NO_DEVICE &&
auxfw_update_severity != VB2_AUXFW_NO_UPDATE)
auxfw_update_req = 1;