michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ztest: unittest: Fix fail/skip/pass outside of tests

Browse source 
When not running in setup, before, or in the test. Calling fail, skip,
or pass is invalid and should be considered an error. Properly handle
these cases by printing a more detailed error message and bailing the
process.

Signed-off-by: Yuval Peress <peress@google.com>
This commit is contained in:
Yuval Peress 2022-08-09 22:11:06 -06:00 • committed by Carles Cufí
commit 5b6b304e3c
1 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

31
subsys/testsuite/ztest/src/ztest_new.c
View file

@ -311,19 +311,39 @@ void ztest_test_fail(void)
longjmp(test_suite_fail, 1);
case TEST_PHASE_BEFORE:
case TEST_PHASE_TEST:
case TEST_PHASE_AFTER:
case TEST_PHASE_TEARDOWN:
PRINT(" at %s function\n", get_friendly_phase_name(phase));
longjmp(test_fail, 1);
case TEST_PHASE_AFTER:
case TEST_PHASE_TEARDOWN:
case TEST_PHASE_FRAMEWORK:
PRINT("\n");
PRINT(" ERROR: cannot fail in test '%s()', bailing\n",
get_friendly_phase_name(phase));
longjmp(stack_fail, 1);
}
}
void ztest_test_pass(void) { longjmp(test_pass, 1); }
void ztest_test_pass(void)
{
if (phase == TEST_PHASE_TEST) {
longjmp(test_pass, 1);
}
PRINT(" ERROR: cannot pass in test '%s()', bailing\n", get_friendly_phase_name(phase));
longjmp(stack_fail, 1);
}
void ztest_test_skip(void) { longjmp(test_skip, 1); }
void ztest_test_skip(void)
{
switch (phase) {
case TEST_PHASE_SETUP:
case TEST_PHASE_BEFORE:
case TEST_PHASE_TEST:
longjmp(test_skip, 1);
default:
PRINT(" ERROR: cannot skip in test '%s()', bailing\n",
get_friendly_phase_name(phase));
longjmp(stack_fail, 1);
}
}
static int run_test(struct ztest_suite_node *suite, struct ztest_unit_test *test, void *data)
{
@ -358,6 +378,7 @@ static int run_test(struct ztest_suite_node *suite, struct ztest_unit_test *test
}
run_test_functions(suite, test, data);
out:
phase = TEST_PHASE_FRAMEWORK;
ret |= cleanup_test(test);
phase = TEST_PHASE_AFTER;
if (test_result != ZTEST_RESULT_SUITE_FAIL) {