Merge pull request #568 from sappo/master

Cleaned up zyre selftest
zeromq · Jan 31, 2018 · 8315323 · 8315323
2 parents 87cc0fb + 25a04a0
commit 8315323
Showing 1 changed file with 24 additions and 22 deletions.
diff --git a/src/zyre.c b/src/zyre.c
@@ -822,8 +822,10 @@ zyre_test (bool verbose)
         assert (node3);
         assert (node4);
 
-        zyre_set_verbose (node3);
-        zyre_set_verbose (node4);
+        if (verbose) {
+            zyre_set_verbose (node3);
+            zyre_set_verbose (node4);
+        }
 
         zyre_set_zap_domain(node3, "TEST");
         zyre_set_zap_domain(node4, "TEST");
@@ -837,20 +839,20 @@ zyre_test (bool verbose)
         assert (node3_cert);
         assert (node4_cert);
 
-        zyre_set_zcert(node3, node3_cert);
-        zyre_set_zcert(node4, node4_cert);
+        zyre_set_zcert (node3, node3_cert);
+        zyre_set_zcert (node4, node4_cert);
 
-        zyre_set_header(node3, "X-PUBLICKEY", "%s", zcert_public_txt(node3_cert));
-        zyre_set_header(node4, "X-PUBLICKEY", "%s", zcert_public_txt(node4_cert));
+        zyre_set_header (node3, "X-PUBLICKEY", "%s", zcert_public_txt (node3_cert));
+        zyre_set_header (node4, "X-PUBLICKEY", "%s", zcert_public_txt (node4_cert));
 
         // test beacon
         if (verbose)
             zsys_debug ("----------------TESTING BEACON----------------");
 
-        rc = zyre_start(node3);
+        rc = zyre_start (node3);
         assert (rc == 0);
 
-        rc = zyre_start(node4);
+        rc = zyre_start (node4);
         assert (rc == 0);
 
         zyre_join (node3, "GLOBAL");
@@ -883,17 +885,17 @@ zyre_test (bool verbose)
         command = zmsg_popstr (msg);
         assert (streq (command, "JOIN"));
         zstr_free (&command);
-        zmsg_destroy(&msg);
+        zmsg_destroy (&msg);
 
         msg = zyre_recv (node4);
         assert (msg);
         command = zmsg_popstr (msg);
         assert (streq (command, "SHOUT"));
         zstr_free (&command);
-        zmsg_destroy(&msg);
+        zmsg_destroy (&msg);
 
-        zyre_leave(node3, "GLOBAL");
-        zyre_leave(node4, "GLOBAL");
+        zyre_leave (node3, "GLOBAL");
+        zyre_leave (node4, "GLOBAL");
 
         zstr_free (&name);
         zstr_free (&peerid);
@@ -948,10 +950,11 @@ zyre_test (bool verbose)
         zyre_gossip_bind(node5, "tcp://127.0.0.1:9001");
         zyre_gossip_connect_curve(node6, gossip_cert, "tcp://127.0.0.1:9001");
 
-        zyre_start(node5);
-        zsock_wait(node5);
-        zyre_start(node6);
-        zsock_wait(node6);
+        rc = zyre_start (node5);
+        assert (rc == 0);
+
+        rc = zyre_start (node6);
+        assert (rc == 0);
 
         zyre_join (node5, "GLOBAL");
         zyre_join (node6, "GLOBAL");
@@ -970,7 +973,6 @@ zyre_test (bool verbose)
         msg = zyre_recv (node6);
         assert (msg);
         command = zmsg_popstr (msg);
-        zsys_info(command);
         assert (streq (command, "ENTER"));
         zstr_free (&command);
 
@@ -982,8 +984,8 @@ zyre_test (bool verbose)
         assert (streq (name, "node5"));
         zstr_free (&name);
 
-        zyre_leave(node5, "GLOBAL");
-        zyre_leave(node6, "GLOBAL");
+        zyre_leave (node5, "GLOBAL");
+        zyre_leave (node6, "GLOBAL");
 
         zyre_stop (node5);
         zyre_stop (node6);
@@ -996,9 +998,9 @@ zyre_test (bool verbose)
         zcert_destroy (&node5_cert);
         zcert_destroy (&node6_cert);
 
-        zyre_destroy(&node5);
-        zyre_destroy(&node6);
-        zactor_destroy(&auth);
+        zyre_destroy (&node5);
+        zyre_destroy (&node6);
+        zactor_destroy (&auth);
 
         printf ("OK\n");