Merge branch 'bugfix/ttfw_fix_flush_index_error' into 'master'

test: TTFW fix flush index error

See merge request espressif/esp-idf!14217

tools/ci/python_packages/tiny_test_fw/DUT.py

@@ -548,13 +548,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
@@ -604,6 +602,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()
@@ -611,7 +610,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)