commit e236c1b6bb4debd0cc0093d793221e1ac438d2ae
author Subrata Banik <subratabanik@google.com> Tue Jul 19 17:20:17 2022 +0530
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Sep 06 16:14:33 2022 +0000
tree 79afe8711302fe7911c9a21c208101e77ac0ad78
parent 29c746efc0540606527fa5d495d0d8d7135055ff

server/site_tests: Update the elog event strings

This patch updates elog event strings to maintain the name symmetry
with util/cbfstool/eventlog.c file.

BUG=b:215615970
TEST=test_that --board=brya --autotest_dir=`pwd` {DUT IP} firmware_EventLog

Change-Id: I214c0789fd155fecf6fc71b128d87df20dfff739
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3767766
Commit-Queue: Subrata Banik <subratabanik@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Tested-by: Subrata Banik <subratabanik@chromium.org>
(cherry picked from commit f5aa82850f1239446ecc6c8eadb77871b2839cea)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3874722
Reviewed-by: Subrata Banik <subratabanik@chromium.org>
Commit-Queue: Ivan Chen <yulunchen@google.com>
Tested-by: Ivan Chen <yulunchen@google.com>

server/site_tests/firmware_EventLog/firmware_EventLog.py

diff --git a/server/site_tests/firmware_EventLog/firmware_EventLog.py b/server/site_tests/firmware_EventLog/firmware_EventLog.py
index 68315d4..3161651 100644
--- a/server/site_tests/firmware_EventLog/firmware_EventLog.py
+++ b/server/site_tests/firmware_EventLog/firmware_EventLog.py
@@ -114,7 +114,7 @@
                               }))
         self._gather_events()
         if (not self._has_event(r'System boot') or
-            not self._has_event(r'Chrome[ ]?OS Developer Mode')):
+            not self._has_event(r'Chrome[ ]?OS Developer Mode|boot_mode=Developer')):
             raise error.TestFail('Missing required event on dev mode boot.')
         disallowedEvents = re.compile(r'Recovery Mode|Sleep| Wake')
         for event in self._events:
@@ -140,7 +140,8 @@
                               }))
         self._gather_events()
         if (not self._has_event(r'System boot') or
-            not self._has_event(r'Chrome[ ]?OS Recovery Mode \| Recovery Button')):
+            not self._has_event(r'Chrome[ ]?OS Recovery Mode \| Recovery Button|'
+                                'boot_mode=Manual recovery')):
             raise error.TestFail('Missing required event in recovery mode.')
         if self._has_event(r'Developer Mode|Sleep|FW Wake|ACPI Wake \| S3'):
             raise error.TestFail('Incorrect event logged in recovery mode.')