michaelh/zephyr
1
0
Fork 0
Code Releases Activity

twister: Improve handling of errors while flashing device

Browse source 
The patch improves handling runners errors from flashing. It
add thread termination in case of process returning non 0 exit
code. Before, even though the error was returned,
a thread was not terminated and test ended
only after timeout termination. The patch also adds information about
the failure reason to the reports

Signed-off-by: Maciej Perkowski <Maciej.Perkowski@nordicsemi.no>
This commit is contained in:
Maciej Perkowski 2021-02-24 13:43:05 +01:00 • committed by Anas Nashif
commit f050a999f2
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
scripts/pylib/twister/twisterlib.py
View file

@ -814,6 +814,8 @@ class DeviceHandler(Handler):
self.instance.reason = "Device issue (Flash?)"
with open(d_log, "w") as dlog_fp:
dlog_fp.write(stderr.decode())
os.write(write_pipe, b'x') # halt the thread
out_state = "flash_error"
except subprocess.TimeoutExpired:
proc.kill()
(stdout, stderr) = proc.communicate()
@ -846,12 +848,15 @@ class DeviceHandler(Handler):
handler_time = time.time() - start_time
if out_state == "timeout":
if out_state in ["timeout", "flash_error"]:
for c in self.instance.testcase.cases:
if c not in harness.tests:
harness.tests[c] = "BLOCK"
self.instance.reason = "Timeout"
if out_state == "timeout":
self.instance.reason = "Timeout"
elif out_state == "flash_error":
self.instance.reason = "Flash error"
self.instance.results = harness.tests
@ -864,7 +869,7 @@ class DeviceHandler(Handler):
if harness.state:
self.set_state(harness.state, handler_time)
if harness.state == "failed":
if harness.state == "failed":
self.instance.reason = "Failed"
else:
self.set_state(out_state, handler_time)
@ -2415,7 +2420,7 @@ class ProjectBuilder(FilterBuilder):
results.done += 1
instance = self.instance
if instance.status in ["error", "failed", "timeout"]:
if instance.status in ["error", "failed", "timeout", "flash_error"]:
if instance.status == "error":
results.error += 1
results.failed += 1
@ -3381,7 +3386,7 @@ class TestSuite(DisablePyTestCollectionMixin):
else:
fails += 1
else:
if instance.status in ["error", "failed", "timeout"]:
if instance.status in ["error", "failed", "timeout", "flash_error"]:
if instance.reason in ['build_error', 'handler_crash']:
errors += 1
else:
@ -3467,7 +3472,7 @@ class TestSuite(DisablePyTestCollectionMixin):
eleTestcase,
'error',
type="failure",
message="failed")
message=instance.reason)
log_root = os.path.join(self.outdir, instance.platform.name, instance.testcase.name)
log_file = os.path.join(log_root, "handler.log")
el.text = self.process_log(log_file)
@ -3498,7 +3503,7 @@ class TestSuite(DisablePyTestCollectionMixin):
name="%s" % (instance.testcase.name),
time="%f" % handler_time)
if instance.status in ["error", "failed", "timeout"]:
if instance.status in ["error", "failed", "timeout", "flash_error"]:
failure = ET.SubElement(
eleTestcase,
'failure',