From 61fb681036d660f76021e618646a657d20175bc9 Mon Sep 17 00:00:00 2001 From: Yuval Peress Date: Wed, 10 Aug 2022 22:50:01 -0600 Subject: [PATCH] ztest: Match cleanup ordering between unittest and normal tests Tests with KERNEL enabled perform their cleanup logic after the suite's after and test rules are executed. Unittests should do the same. Signed-off-by: Yuval Peress --- subsys/testsuite/ztest/src/ztest_new.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subsys/testsuite/ztest/src/ztest_new.c b/subsys/testsuite/ztest/src/ztest_new.c index 1d0aa6c5dcb..7354a8f275e 100644 --- a/subsys/testsuite/ztest/src/ztest_new.c +++ b/subsys/testsuite/ztest/src/ztest_new.c @@ -387,8 +387,6 @@ 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) { if (suite->after != NULL) { @@ -396,6 +394,8 @@ out: } run_test_rules(/*is_before=*/false, test, data); } + phase = TEST_PHASE_FRAMEWORK; + ret |= cleanup_test(test); ret = get_final_test_result(test, ret); Z_TC_END_RESULT(ret, test->name);