Commit ea3f105f authored by Dmitrii Golovanov's avatar Dmitrii Golovanov Committed by Fabio Baltieri
Browse files

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: default avatarDmitrii Golovanov <dmitrii.golovanov@intel.com>
parent 98928c0a

scripts/pylib/twister/twisterlib/handlers.py

+4 −2
Changes for scripts/pylib/twister/twisterlib/handlers.py: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -326,11 +326,13 @@ class BinaryHandler(Handler): 
            else:

                # When a process is killed, the default handler returns 128 + SIGTERM

                # so in that case the return code itself is not meaningful

                self.instance.reason = "Failed"

                self.instance.reason = f"Failed (rc={self.returncode})"

            self.instance.add_missing_case_status(TwisterStatus.BLOCK)

        elif harness_status != TwisterStatus.NONE:

            self.instance.status = harness_status

            if harness_status == TwisterStatus.FAIL:

                self.instance.reason = "Failed"

                self.instance.reason = "Failed harness"

            self.instance.add_missing_case_status(TwisterStatus.BLOCK)

        else:

            self.instance.status = TwisterStatus.FAIL

            self.instance.reason = "Timeout"

scripts/tests/twister/test_handlers.py

+2 −2
Changes for scripts/tests/twister/test_handlers.py: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -510,8 +510,8 @@ def test_binaryhandler_create_env( 


TESTDATA_6 = [

    (TwisterStatus.NONE, False, 2, True, TwisterStatus.FAIL, 'Valgrind error', False),

    (TwisterStatus.NONE, False, 1, False, TwisterStatus.FAIL, 'Failed', False),

    (TwisterStatus.FAIL, False, 0, False, TwisterStatus.FAIL, 'Failed', False),

    (TwisterStatus.NONE, False, 1, False, TwisterStatus.FAIL, 'Failed (rc=1)', False),

    (TwisterStatus.FAIL, False, 0, False, TwisterStatus.FAIL, 'Failed harness', False),

    ('success', False, 0, False, 'success', 'Unknown', False),

    (TwisterStatus.NONE, True, 1, True, TwisterStatus.FAIL, 'Timeout', True),

]

scripts/tests/twister_blackbox/test_device.py

+1 −1
Changes for scripts/tests/twister_blackbox/test_device.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -72,5 +72,5 @@ class TestDevice: 


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



        expected_line = r'seed_native_sim.dummy FAILED Failed \(native (\d+\.\d+)s/seed: {}\)'.format(seed[0])

        expected_line = r'seed_native_sim.dummy FAILED Failed \(rc=1\) \(native (\d+\.\d+)s/seed: {}\)'.format(seed[0])

        assert re.search(expected_line, err)

CRA Git | Maintained and supported by SUSTech CRA and CCSE