alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ttfw: fix incorrect length when flush data cache after expect:

Browse Source 
data cache is unicode. while we use bytes in RegEx expect. The index of
matched pattern is calculated with bytes, could be different from
unicode. Now we fix this issue by using unicode in expect.
This commit is contained in:
He Yin Ling 2021-07-01 17:48:53 +08:00
parent ce279af00d
commit b8ca42400b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/ci/python_packages/tiny_test_fw/DUT.py
View File

@ -540,13 +540,11 @@ class BaseDUT(object):
:return: match groups if match succeed otherwise None
"""
ret = None
if isinstance(pattern.pattern, type(u'')):
pattern = re.compile(BaseDUT.u_to_bytearray(pattern.pattern))
if isinstance(data, type(u'')):
data = BaseDUT.u_to_bytearray(data)
if isinstance(pattern.pattern, bytes):
pattern = re.compile(_decode_data(pattern.pattern))
match = pattern.search(data)
if match:
ret = tuple(None if x is None else x.decode() for x in match.groups())
ret = tuple(x for x in match.groups())
index = match.end()
else:
index = -1