X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fblackbox%2Frun_blackbox_tests%2Ftest_cases_submesh03.c;h=eecd539dc92c8451dc1e07f81f6ffa2fb5157ef2;hb=cdb3dada645394bb1e0d0bf7816291fbd9a2a4a0;hp=76b6ef9e852e05467359c45f9b0073168beb9f76;hpb=4108810af455f463dfbcdac0e2e0b2ba0312bf26;p=meshlink

diff --git a/test/blackbox/run_blackbox_tests/test_cases_submesh03.c b/test/blackbox/run_blackbox_tests/test_cases_submesh03.c
index 76b6ef9e..eecd539d 100644
--- a/test/blackbox/run_blackbox_tests/test_cases_submesh03.c
+++ b/test/blackbox/run_blackbox_tests/test_cases_submesh03.c
@@ -50,9 +50,9 @@ static mesh_event_t app1_node1[] = { NODE_STARTED, NODE_JOINED, CHANNEL_OPENED,
 static mesh_event_t app1_node2[] = { NODE_STARTED, NODE_JOINED, CHANNEL_OPENED, CHANNEL_DATA_RECIEVED, CHANNEL_OPENED, CHANNEL_DATA_RECIEVED, MESH_EVENT_COMPLETED};
 
 static node_status_t node_status[3] = {
-	{core_node1, 0, 3, false},
-	{app1_node1, 0, 4, false},
-	{app1_node2, 0, 7, false}
+	{core_node1, 0, 3},
+	{app1_node1, 0, 4},
+	{app1_node2, 0, 7},
 };
 
 /* State structure for SubMesh Test Case #3 */
@@ -64,6 +64,8 @@ static black_box_state_t test_case_submesh_3_state = {
 };
 
 static int black_box_group0_setup(void **state) {
+	(void)state;
+
 	const char *nodes[] = { "corenode1", "app1node1", "app1node2" };
 	int num_nodes = sizeof(nodes) / sizeof(nodes[0]);
 
@@ -75,23 +77,14 @@ static int black_box_group0_setup(void **state) {
 }
 
 static int black_box_group0_teardown(void **state) {
+	(void)state;
+
 	PRINT_TEST_CASE_MSG("Destroying Containers\n");
 	destroy_containers();
 
 	return 0;
 }
 
-static int black_box_all_nodes_setup(void **state) {
-	const char *nodes[] = { "corenode1" };
-	int num_nodes = sizeof(nodes) / sizeof(nodes[0]);
-
-	PRINT_TEST_CASE_MSG("Creating Containers\n");
-	destroy_containers();
-	create_containers(nodes, num_nodes);
-	PRINT_TEST_CASE_MSG("Created Containers\n");
-	return 0;
-}
-
 static void restart_all_nodes(char *import) {
 	int i;
 
@@ -113,7 +106,7 @@ static bool event_cb(mesh_event_payload_t payload) {
 	assert(change_state(&node_status[payload.client_id], payload.mesh_event));
 
 	if(payload.mesh_event == NODE_JOINED) {
-		signal_node_start(node_status, 1, 2, node_ids);
+		signal_node_start(node_status, 1, 2, (char **)node_ids);
 	}
 
 	if(check_nodes_finished(node_status, 3)) {
@@ -144,10 +137,7 @@ static void test_case_submesh_03(void **state) {
 */
 static bool test_steps_submesh_03(void) {
 	char *invite_app1node1, *invite_app1node2;
-	bool result = false;
-	int i;
 	char *import;
-	pthread_t thread1, thread2;
 
 	import = mesh_event_sock_create(eth_if_name);
 	invite_app1node1 = invite_in_container("corenode1", "app1node1");
@@ -186,4 +176,4 @@ int test_cases_submesh03(void) {
 	total_tests += sizeof(blackbox_group0_tests) / sizeof(blackbox_group0_tests[0]);
 
 	return cmocka_run_group_tests(blackbox_group0_tests, black_box_group0_setup, black_box_group0_teardown);
-}
\ No newline at end of file
+}