From: Guus Sliepen <guus@meshlink.io>
Date: Thu, 11 Jun 2020 20:31:25 +0000 (+0200)
Subject: Fix some test cases using the same configuration directory.
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=1278c5d654a4f555a1be1ce5351017201fe34d0b;p=meshlink

Fix some test cases using the same configuration directory.
---

diff --git a/test/channels-aio-cornercases.c b/test/channels-aio-cornercases.c
index 1116866e..0640c7df 100644
--- a/test/channels-aio-cornercases.c
+++ b/test/channels-aio-cornercases.c
@@ -120,7 +120,7 @@ int main(int argc, char *argv[]) {
 	// Open two new meshlink instance.
 
 	meshlink_handle_t *mesh_a, *mesh_b;
-	open_meshlink_pair(&mesh_a, &mesh_b, "channels_aio");
+	open_meshlink_pair(&mesh_a, &mesh_b, "channels_aio_cornercases");
 
 	// Set the callbacks.
 
diff --git a/test/channels-fork.c b/test/channels-fork.c
index 30f7cf8e..483f430b 100644
--- a/test/channels-fork.c
+++ b/test/channels-fork.c
@@ -91,7 +91,7 @@ static int main1(int rfd, int wfd) {
 	meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
 
 	assert(meshlink_destroy("channels_fork_conf.1"));
-	meshlink_handle_t *mesh = meshlink_open("channels_fork_conf.1", "foo", "channels", DEV_CLASS_BACKBONE);
+	meshlink_handle_t *mesh = meshlink_open("channels_fork_conf.1", "foo", "channels-fork", DEV_CLASS_BACKBONE);
 	assert(mesh);
 
 	meshlink_enable_discovery(mesh, false);
@@ -147,7 +147,7 @@ static int main2(int rfd, int wfd) {
 	meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
 
 	assert(meshlink_destroy("channels_fork_conf.2"));
-	meshlink_handle_t *mesh = meshlink_open("channels_fork_conf.2", "bar", "channels", DEV_CLASS_BACKBONE);
+	meshlink_handle_t *mesh = meshlink_open("channels_fork_conf.2", "bar", "channels-fork", DEV_CLASS_BACKBONE);
 	assert(mesh);
 
 	meshlink_enable_discovery(mesh, false);
diff --git a/test/get-all-nodes.c b/test/get-all-nodes.c
index 3340982b..815dc7df 100644
--- a/test/get-all-nodes.c
+++ b/test/get-all-nodes.c
@@ -36,10 +36,10 @@ int main(void) {
 	assert(meshlink_destroy("get_all_nodes_conf.3"));
 
 	meshlink_handle_t *mesh[3];
-	mesh[0] = meshlink_open("get_all_nodes_conf.1", "foo", "import-export", DEV_CLASS_BACKBONE);
+	mesh[0] = meshlink_open("get_all_nodes_conf.1", "foo", "get-all-nodes", DEV_CLASS_BACKBONE);
 	assert(mesh[0]);
 
-	mesh[1] = meshlink_open("get_all_nodes_conf.2", "bar", "import-export", DEV_CLASS_STATIONARY);
+	mesh[1] = meshlink_open("get_all_nodes_conf.2", "bar", "get-all-nodes", DEV_CLASS_STATIONARY);
 	assert(mesh[1]);
 
 	mesh[2] = meshlink_open("get_all_nodes_conf.3", "baz", "get-all-nodes", DEV_CLASS_STATIONARY);
@@ -169,7 +169,7 @@ int main(void) {
 	meshlink_close(mesh[0]);
 	sleep(2);
 	time_t foo_stopped = time(NULL);
-	mesh[0] = meshlink_open("get_all_nodes_conf.1", "foo", "import-export", DEV_CLASS_BACKBONE);
+	mesh[0] = meshlink_open("get_all_nodes_conf.1", "foo", "get-all_nodes", DEV_CLASS_BACKBONE);
 	assert(mesh[0]);
 
 	nodes = meshlink_get_all_nodes(mesh[0], nodes, &nnodes);