Merge branch 'bugfix/ttfw_fix_flush_index_error_v4.1' into 'release/v4.1'

test: TTFW fix flush index error (v4.1)

See merge request espressif/esp-idf!14262
This commit is contained in:
Anton Maklakov 2021-07-30 06:36:04 +00:00
commit a121a37edb

View File

@ -542,13 +542,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