X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fblackbox%2Frun_blackbox_tests%2Ftest_cases_channel_blacklist.c;h=568a475b0682264da910deb3cbc10c695e3461f6;hb=53818faa72ac501f593edfc454b35d1fd4bfb318;hp=d6e9d74421226387c4c2abcd7f13618cf9d15a92;hpb=1d51060d7da210f576b6ae15726615c26c46095c;p=meshlink

diff --git a/test/blackbox/run_blackbox_tests/test_cases_channel_blacklist.c b/test/blackbox/run_blackbox_tests/test_cases_channel_blacklist.c
index d6e9d744..568a475b 100644
--- a/test/blackbox/run_blackbox_tests/test_cases_channel_blacklist.c
+++ b/test/blackbox/run_blackbox_tests/test_cases_channel_blacklist.c
@@ -16,6 +16,11 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
+
+#ifdef NDEBUG
+#undef NDEBUG
+#endif
+
 #include <stdlib.h>
 #include <stdarg.h>
 #include <setjmp.h>
@@ -47,10 +52,8 @@ static mesh_arg_t peer_arg = {.node_name = "peer", .confbase = "peer", .app_name
 static mesh_arg_t nut_arg = {.node_name = "nut", .confbase = "nut", .app_name = "nut", .dev_class = 1 };
 static mesh_invite_arg_t relay_nut_invite_arg = {.mesh_arg = &relay_arg, .invitee_name = "nut" };
 static mesh_invite_arg_t relay_peer_invite_arg = {.mesh_arg = &relay_arg, .invitee_name = "peer" };
-static mesh_invite_arg_t peer_nut_invite_arg = {.mesh_arg = &peer_arg, .invitee_name = "nut" };
 static netns_thread_t netns_relay_nut_invite = {.namespace_name = "relay", .netns_thread = gen_inv, .arg = &relay_nut_invite_arg};
 static netns_thread_t netns_relay_peer_invite = {.namespace_name = "relay", .netns_thread = gen_inv, .arg = &relay_peer_invite_arg};
-static netns_thread_t netns_peer_nut_invite = {.namespace_name = "peer", .netns_thread = gen_inv, .arg = &peer_nut_invite_arg};
 static netns_thread_t netns_relay_handle = {.namespace_name = "relay", .netns_thread = test_channel_blacklist_disonnection_relay_01, .arg = &relay_arg};
 static netns_thread_t netns_peer_handle = {.namespace_name = "peer", .netns_thread = test_channel_blacklist_disonnection_peer_01, .arg = &peer_arg};
 static netns_thread_t netns_nut_handle = {.namespace_name = "nut", .netns_thread = test_channel_blacklist_disonnection_nut_01, .arg = &nut_arg};
@@ -58,12 +61,14 @@ static netns_thread_t netns_nut_handle = {.namespace_name = "nut", .netns_thread
 struct sync_flag test_channel_discon_nut_close = {.mutex  = PTHREAD_MUTEX_INITIALIZER, .cond = PTHREAD_COND_INITIALIZER};
 
 static int setup_test(void **state) {
+	(void)state;
+
 	netns_create_topology(test_channel_disconnection_state);
 	fprintf(stderr, "\nCreated topology\n");
 
-	meshlink_destroy("nut");
-	meshlink_destroy("peer");
-	meshlink_destroy("relay");
+	assert(meshlink_destroy("nut"));
+	assert(meshlink_destroy("peer"));
+	assert(meshlink_destroy("relay"));
 	channel_discon_case_ping = false;
 	channel_discon_network_failure_01 = false;
 	channel_discon_network_failure_02 = false;
@@ -74,15 +79,19 @@ static int setup_test(void **state) {
 }
 
 static int teardown_test(void **state) {
-	meshlink_destroy("nut");
-	meshlink_destroy("peer");
-	meshlink_destroy("relay");
+	(void)state;
+
+	assert(meshlink_destroy("nut"));
+	assert(meshlink_destroy("peer"));
+	assert(meshlink_destroy("relay"));
 	netns_destroy_topology(test_channel_disconnection_state);
 
 	return EXIT_SUCCESS;
 }
 
 static void execute_test(test_step_func_t step_func, void **state) {
+	(void)state;
+
 
 	fprintf(stderr, "\n\x1b[32mRunning Test\x1b[0m\n");
 	bool test_result = step_func();
@@ -102,6 +111,8 @@ static void *gen_inv(void *arg) {
 	assert(invitation);
 	mesh_invite_arg->invite_str = invitation;
 	meshlink_close(mesh);
+
+	return NULL;
 }
 
 static void launch_3_nodes(void) {