Skip to content

Commit ea3f105

Browse files
golowanowfabiobaltieri
authored andcommitted
twister: binaryhandler: Fix None status on test fail
Set missing TestCase statuses when a test under the BinaryHandler failed (crashed), so remaining 'STARTED' and 'NONE' are now 'BLOCK' instead. Signed-off-by: Dmitrii Golovanov <[email protected]>
1 parent 98928c0 commit ea3f105

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

scripts/pylib/twister/twisterlib/handlers.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,11 +326,13 @@ def _update_instance_info(self, harness_status, handler_time):
326326
else:
327327
# When a process is killed, the default handler returns 128 + SIGTERM
328328
# so in that case the return code itself is not meaningful
329-
self.instance.reason = "Failed"
329+
self.instance.reason = f"Failed (rc={self.returncode})"
330+
self.instance.add_missing_case_status(TwisterStatus.BLOCK)
330331
elif harness_status != TwisterStatus.NONE:
331332
self.instance.status = harness_status
332333
if harness_status == TwisterStatus.FAIL:
333-
self.instance.reason = "Failed"
334+
self.instance.reason = "Failed harness"
335+
self.instance.add_missing_case_status(TwisterStatus.BLOCK)
334336
else:
335337
self.instance.status = TwisterStatus.FAIL
336338
self.instance.reason = "Timeout"

scripts/tests/twister/test_handlers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,8 +510,8 @@ def test_binaryhandler_create_env(
510510

511511
TESTDATA_6 = [
512512
(TwisterStatus.NONE, False, 2, True, TwisterStatus.FAIL, 'Valgrind error', False),
513-
(TwisterStatus.NONE, False, 1, False, TwisterStatus.FAIL, 'Failed', False),
514-
(TwisterStatus.FAIL, False, 0, False, TwisterStatus.FAIL, 'Failed', False),
513+
(TwisterStatus.NONE, False, 1, False, TwisterStatus.FAIL, 'Failed (rc=1)', False),
514+
(TwisterStatus.FAIL, False, 0, False, TwisterStatus.FAIL, 'Failed harness', False),
515515
('success', False, 0, False, 'success', 'Unknown', False),
516516
(TwisterStatus.NONE, True, 1, True, TwisterStatus.FAIL, 'Timeout', True),
517517
]

scripts/tests/twister_blackbox/test_device.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,5 @@ def test_seed(self, capfd, out_path, seed):
7272

7373
assert str(sys_exit.value) == '1'
7474

75-
expected_line = r'seed_native_sim.dummy FAILED Failed \(native (\d+\.\d+)s/seed: {}\)'.format(seed[0])
75+
expected_line = r'seed_native_sim.dummy FAILED Failed \(rc=1\) \(native (\d+\.\d+)s/seed: {}\)'.format(seed[0])
7676
assert re.search(expected_line, err)

0 commit comments

Comments
 (0)