Skip to content

Commit 3706357

Browse files
committed
tests: net: websocket: Fix crash when tearing down tests
No need to have setup and teardown functions. Teardown will even cause crash when tearing down last IPv4 test. Fixes #9617 Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
1 parent 0acf76c commit 3706357

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

tests/net/websocket/src/main.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -569,10 +569,6 @@ void test_v4_send_multi_msg(void)
569569
test_send_multi_msg(&app_ctx_v4);
570570
}
571571

572-
static void test_setup(void)
573-
{
574-
return;
575-
}
576572
void test_main(void)
577573
{
578574
ztest_test_suite(websocket,
@@ -588,7 +584,7 @@ void test_main(void)
588584
ztest_unit_test(test_v6_send_recv_6),
589585
ztest_unit_test(test_v6_send_recv_7),
590586
ztest_unit_test(test_v6_send_multi_msg),
591-
ztest_unit_test_setup_teardown(test_v6_close, test_setup, websocket_cleanup_server),
587+
ztest_unit_test(test_v6_close),
592588
ztest_unit_test(test_websocket_init_server),
593589
ztest_unit_test(test_v4_init),
594590
ztest_unit_test(test_v4_connect),
@@ -600,7 +596,7 @@ void test_main(void)
600596
ztest_unit_test(test_v4_send_recv_6),
601597
ztest_unit_test(test_v4_send_recv_7),
602598
ztest_unit_test(test_v4_send_multi_msg),
603-
ztest_unit_test_setup_teardown(test_v4_close, test_setup, websocket_cleanup_server)
599+
ztest_unit_test(test_v4_close)
604600
);
605601

606602
ztest_run_test_suite(websocket);

tests/net/websocket/src/server.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -357,9 +357,3 @@ void test_websocket_init_server(void)
357357

358358
ws_ctx = &http_ctx;
359359
}
360-
361-
void websocket_cleanup_server(void)
362-
{
363-
http_server_disable(&http_ctx);
364-
http_release(&http_ctx);
365-
}

0 commit comments

Comments
 (0)