Don't use assert() to check the results of pthread_*() calls.

[meshlink] / test / import-export.c

diff --git a/test/import-export.c b/test/import-export.c
index 8bc41c1b3c06fad7ac11b7fba4956f41abfe5dac..15e213447eedd211f643aba6a2608e9939db7aef 100644 (file)
--- a/test/import-export.c
+++ b/test/import-export.c
@@ -12,9 +12,9 @@
 #include "meshlink.h"
 #include "utils.h"
 
-struct sync_flag bar_reachable;
+static struct sync_flag bar_reachable;
 
-void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
+static void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
        (void)mesh;
 
        if(reachable && !strcmp(node->name, "bar")) {
@@ -22,7 +22,9 @@ void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
        }
 }
 
-int main() {
+int main(void) {
+       init_sync_flag(&bar_reachable);
+
        meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
 
        // Open two new meshlink instance.
@@ -43,8 +45,8 @@ int main() {
 
        // Import and export both side's data
 
-       assert(meshlink_add_address(mesh1, "localhost"));
-       assert(meshlink_add_address(mesh2, "localhost"));
+       assert(meshlink_set_canonical_address(mesh1, meshlink_get_self(mesh1), "localhost", NULL));
+       assert(meshlink_set_canonical_address(mesh2, meshlink_get_self(mesh2), "localhost", NULL));
 
        char *data = meshlink_export(mesh1);
        assert(data);
@@ -55,9 +57,25 @@ int main() {
        data = meshlink_export(mesh2);
        assert(data);
 
+       assert(meshlink_import(mesh1, data));
+
+       // Check that importing twice is fine
        assert(meshlink_import(mesh1, data));
        free(data);
 
+       // Check that importing garbage is not fine
+       assert(!meshlink_import(mesh1, "Garbage\n"));
+
+       // Check that foo knows bar, but that it is not reachable.
+
+       time_t last_reachable;
+       time_t last_unreachable;
+       meshlink_node_t *bar = meshlink_get_node(mesh1, "bar");
+       assert(bar);
+       assert(!meshlink_get_node_reachability(mesh1, bar, &last_reachable, &last_unreachable));
+       assert(!last_reachable);
+       assert(!last_unreachable);
+
        // Start both instances
 
        meshlink_set_node_status_cb(mesh1, status_cb);
@@ -80,6 +98,24 @@ int main() {
 
        assert(pmtu);
 
+       // Check that we now have reachability information
+
+       assert(meshlink_get_node_reachability(mesh1, bar, &last_reachable, &last_unreachable));
+       assert(last_reachable);
+       assert(!last_unreachable);
+
+       // Stop the meshes.
+
+       meshlink_stop(mesh1);
+       meshlink_stop(mesh2);
+
+       // Check that bar is no longer reachable
+
+       assert(!meshlink_get_node_reachability(mesh1, bar, &last_reachable, &last_unreachable));
+       assert(last_reachable);
+       assert(last_unreachable);
+       assert(last_reachable <= last_unreachable);
+
        // Clean up.
 
        meshlink_close(mesh2);