commit b4185213e5b7376dbcccd6561ce01b74ed68fa26
author Cheng Yueh <cyueh@chromium.org> Tue Nov 17 09:01:11 2020
committer Commit Bot <commit-bot@chromium.org> Thu Nov 19 06:13:06 2020
tree 579ceeab90c24c84d387d7f87159b3343c29e804
parent 24a1d2af2b34b126ca58bd75cd8e9113c05ccc76

pack_firmware_unittest: Fix '.' in regular expressions

Sometimes tmp_dir contains 'ecxbin' as a substring. This CL fixes some
'.' with '\.' in regular expressions when we really mean '\.' to prevent
matching 'ecxbin' with 'ec.bin'.

BUG=chromium:1112892
TEST=`FEATURES="test" emerge-jacuzzi chromeos-firmware-jacuzzi`

Change-Id: I38ae491371c71c6e952b523cb44875430f695540
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/firmware/+/2546252
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Tested-by: Cheng Yueh <cyueh@chromium.org>
Commit-Queue: Cheng Yueh <cyueh@chromium.org>

pack_firmware_unittest.py

diff --git a/pack_firmware_unittest.py b/pack_firmware_unittest.py
index 315d693..dca0499 100755
--- a/pack_firmware_unittest.py
+++ b/pack_firmware_unittest.py
@@ -447,7 +447,7 @@
     rc.AddCmdResult(partial_mock.ListRegex(r'(?:^|\s)file(?:$|\s)'),
                     returncode=0, output='ELF 64-bit LSB executable, etc.\n')
     rc.AddCmdResult(
-        partial_mock.ListRegex('futility dump_fmap -x .*image.bin$'),
+        partial_mock.ListRegex(r'futility dump_fmap -x .*image\.bin$'),
         side_effect=_CopySections, returncode=0)
     rc.AddCmdResult(partial_mock.ListRegex('futility gbb'), returncode=0,
                     output=' - exported root_key to file: rootkey.bin')
@@ -455,9 +455,9 @@
         partial_mock.ListRegex('futility vbutil_firmware'),
         returncode=0, output=VBUTIL_OUTPUT)
     rc.AddCmdResult(partial_mock.ListRegex('--repack'), returncode=0)
-    rc.AddCmdResult(partial_mock.ListRegex('futility dump_fmap -x .*ec.bin'),
+    rc.AddCmdResult(partial_mock.ListRegex(r'futility dump_fmap -x .*ec\.bin'),
                     side_effect=_CopySections, returncode=0)
-    rc.AddCmdResult(partial_mock.ListRegex('futility dump_fmap -x .*pd.bin'),
+    rc.AddCmdResult(partial_mock.ListRegex(r'futility dump_fmap -x .*pd\.bin'),
                     side_effect=_CopySections, returncode=0)
 
   @staticmethod
@@ -502,27 +502,29 @@
 
   @classmethod
   def _AddMergeMocks(cls, rc, mocked_dump_fmap_output):
-    rc.AddCmdResult(partial_mock.ListRegex(
-        'futility dump_fmap -x .*/images-merged/.*image_rw.bin'), returncode=0)
     rc.AddCmdResult(
         partial_mock.ListRegex(
-            'futility dump_fmap -p .*/images-merged/.*image_rw.bin'),
+            r'futility dump_fmap -x .*/images-merged/.*image_rw\.bin'),
+        returncode=0)
+    rc.AddCmdResult(
+        partial_mock.ListRegex(
+            r'futility dump_fmap -p .*/images-merged/.*image_rw\.bin'),
         returncode=0, output=mocked_dump_fmap_output)
     rc.AddCmdResult(
-        partial_mock.ListRegex('futility dump_fmap -p .*image.binrw'),
+        partial_mock.ListRegex(r'futility dump_fmap -p .*image\.binrw'),
         returncode=0, output=mocked_dump_fmap_output)
     rc.AddCmdResult(
-        partial_mock.ListRegex('futility dump_fmap -p .*image.bin'),
+        partial_mock.ListRegex(r'futility dump_fmap -p .*image\.bin'),
         returncode=0, output=mocked_dump_fmap_output)
     rc.AddCmdResult(partial_mock.Regex('extract_ecrw'), returncode=0)
-    rc.AddCmdResult(partial_mock.ListRegex('futility dump_fmap -p .*ec.bin'),
+    rc.AddCmdResult(partial_mock.ListRegex(r'futility dump_fmap -p .*ec\.bin'),
                     returncode=0, output=FMAP_OUTPUT_EC)
     rc.AddCmdResult(partial_mock.ListRegex('cbfstool'), returncode=0,
                     side_effect=cls._CreateCbfstoolFile)
-    rc.AddCmdResult(partial_mock.ListRegex('futility dump_fmap -p .*pd.bin'),
+    rc.AddCmdResult(partial_mock.ListRegex(r'futility dump_fmap -p .*pd\.bin'),
                     returncode=0, output=FMAP_OUTPUT_EC)
     rc.AddCmdResult(
-        partial_mock.ListRegex('futility dump_fmap -x .*image.bin .*_MAIN_A'),
+        partial_mock.ListRegex(r'futility dump_fmap -x .*image\.bin .*_MAIN_A'),
         returncode=0, side_effect=cls._CreateDumpfmapFile)
 
   def testMockedRun(self):