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>
zephyrproject-rtos · Aug 29, 2018 · 44498e6 · 44498e6
1 parent a81aad9
commit 44498e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/tests/net/websocket/src/main.c b/tests/net/websocket/src/main.c
@@ -569,10 +569,6 @@ void test_v4_send_multi_msg(void)
 	test_send_multi_msg(&app_ctx_v4);
 }
 
-static void test_setup(void)
-{
-	return;
-}
 void test_main(void)
 {
 	ztest_test_suite(websocket,
@@ -588,7 +584,7 @@ void test_main(void)
 			 ztest_unit_test(test_v6_send_recv_6),
 			 ztest_unit_test(test_v6_send_recv_7),
 			 ztest_unit_test(test_v6_send_multi_msg),
-			 ztest_unit_test_setup_teardown(test_v6_close, test_setup, websocket_cleanup_server),
+			 ztest_unit_test(test_v6_close),
 			 ztest_unit_test(test_websocket_init_server),
 			 ztest_unit_test(test_v4_init),
 			 ztest_unit_test(test_v4_connect),
@@ -600,7 +596,7 @@ void test_main(void)
 			 ztest_unit_test(test_v4_send_recv_6),
 			 ztest_unit_test(test_v4_send_recv_7),
 			 ztest_unit_test(test_v4_send_multi_msg),
-			 ztest_unit_test_setup_teardown(test_v4_close, test_setup, websocket_cleanup_server)
+			 ztest_unit_test(test_v4_close)
 			 );
 
 	ztest_run_test_suite(websocket);

diff --git a/tests/net/websocket/src/server.c b/tests/net/websocket/src/server.c
@@ -357,9 +357,3 @@ void test_websocket_init_server(void)
 
 	ws_ctx = &http_ctx;
 }
-
-void websocket_cleanup_server(void)
-{
-	http_server_disable(&http_ctx);
-	http_release(&http_ctx);
-}