michaelh/zephyr
1
0
Fork 0
Code Releases Activity

twister: fix the mis-placed drain logic.

Browse source 
The logic to drain the leftover logs of previous test should be
put before the monitor_serial(). It was misplaced when re-adding
this logic back.

Signed-off-by: Ming Shao <ming.shao@intel.com>
This commit is contained in:
Ming Shao 2022-10-20 09:56:37 +08:00 • committed by Carles Cufí
commit 75914111d9
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
scripts/pylib/twister/twisterlib/handlers.py
View file

@ -333,19 +333,6 @@ class DeviceHandler(Handler):
ser.flush()
# turns out the ser.flush() is not enough to clear serial leftover from last case
# explicitly readline() can do it reliably
old_timeout = ser.timeout
# wait for 1s if no serial output
ser.timeout = 1
# or read 1000 lines at most
# if the leftovers are more than 1000 lines, user should realize that once
# saw the caught ones and fix it.
leftover_lines = ser.readlines(1000)
for line in leftover_lines:
logger.debug(f"leftover log of previous test: {line}")
ser.timeout = old_timeout
while ser.isOpen():
if halt_event.is_set():
logger.debug('halted')
@ -538,6 +525,19 @@ class DeviceHandler(Handler):
ser.flush()
# turns out the ser.flush() is not enough to clear serial leftover from last case
# explicitly readline() can do it reliably
old_timeout = ser.timeout
# wait for 1s if no serial output
ser.timeout = 1
# or read 1000 lines at most
# if the leftovers are more than 1000 lines, user should realize that once
# saw the caught ones and fix it.
leftover_lines = ser.readlines(1000)
for line in leftover_lines:
logger.debug(f"leftover log of previous test: {line}")
ser.timeout = old_timeout
harness_name = self.instance.testsuite.harness.capitalize()
harness_import = HarnessImporter(harness_name)
harness = harness_import.instance