X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fblackbox%2Fcommon%2Ftest_step.c;h=be0416d9121817af2dac734ada41bae374e73432;hb=4108810af455f463dfbcdac0e2e0b2ba0312bf26;hp=4a2bf853896886c03d7f9fdeb13dbd91aa359eed;hpb=dc68da94af8fca91748579c84ef5ed798db7efab;p=meshlink

diff --git a/test/blackbox/common/test_step.c b/test/blackbox/common/test_step.c
index 4a2bf853..be0416d9 100644
--- a/test/blackbox/common/test_step.c
+++ b/test/blackbox/common/test_step.c
@@ -39,6 +39,7 @@ meshlink_handle_t *execute_open(char *node_name, char *dev_class) {
 	/* Create meshlink instance */
 	mesh_handle = meshlink_open("testconf", node_name, "node_sim", atoi(dev_class));
 	fprintf(stderr, "meshlink_open status: %s\n", meshlink_strerror(meshlink_errno));
+	meshlink_enable_discovery(mesh_handle, false);
 	PRINT_TEST_CASE_MSG("meshlink_open status: %s\n", meshlink_strerror(meshlink_errno));
 	assert(mesh_handle);
 
@@ -50,8 +51,8 @@ meshlink_handle_t *execute_open(char *node_name, char *dev_class) {
 	return mesh_handle;
 }
 
-char *execute_invite(char *invitee) {
-	char *invite_url = meshlink_invite(mesh_handle, invitee);
+char *execute_invite(char *invitee, meshlink_submesh_t *submesh) {
+	char *invite_url = meshlink_invite_ex(mesh_handle, submesh, invitee, MESHLINK_INVITE_LOCAL | MESHLINK_INVITE_NUMERIC);
 
 	PRINT_TEST_CASE_MSG("meshlink_invite status: %s\n", meshlink_strerror(meshlink_errno));
 	assert(invite_url);
@@ -62,15 +63,7 @@ char *execute_invite(char *invitee) {
 void execute_join(char *invite_url) {
 	bool join_status;
 
-	/* The inviting node may take a moment to open its listening port
-	    This sleep() prevents meshlink_join() from failing when the listening port is not open */
-	/* TO DO: Replace this with code that actually checks for the port being open, if possible */
-	PRINT_TEST_CASE_MSG("Sleeping 1 sec to allow inviting node to start listening...\n");
-	sleep(1);
-
-	PRINT_TEST_CASE_MSG("About to join with mesh_handle = %p, invite_url = %s\n", mesh_handle, invite_url);
 	join_status = meshlink_join(mesh_handle, invite_url);
-	PRINT_TEST_CASE_MSG("meshlink_join status: %s\n", meshlink_strerror(meshlink_errno));
 	assert(join_status);
 }