espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 03:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
test: TTFW fix flush index error (v4.3)

See merge request espressif/esp-idf!14260
This commit is contained in:
Anton Maklakov
2021-07-30 06:36:20 +00:00
parent 95c572c0d2 b8ca42400b
commit 983e0c7fb2
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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
@@ -596,6 +594,7 @@ class BaseDUT(object):
while True:
ret, index = method(data, pattern)
if ret is not None:
stdout = data[:index]
self.data_cache.flush(index)
break
time_remaining = start_time + timeout - time.time()
@@ -603,7 +602,6 @@ class BaseDUT(object):
break
# wait for new data from cache
data = self.data_cache.get_data(time_remaining)
stdout = data
if ret is None:
pattern = _pattern_to_string(pattern)