diff options
Diffstat (limited to 'src/core/reconnect_test.c')
| -rw-r--r-- | src/core/reconnect_test.c | 159 |
1 files changed, 77 insertions, 82 deletions
diff --git a/src/core/reconnect_test.c b/src/core/reconnect_test.c index 669261c9..308a3f78 100644 --- a/src/core/reconnect_test.c +++ b/src/core/reconnect_test.c @@ -10,101 +10,95 @@ #include <string.h> -#include <nng/nng.h> -#include <nng/protocol/pipeline0/pull.h> -#include <nng/protocol/pipeline0/push.h> -#include <nng/supplemental/util/platform.h> - -#include "acutest.h" -#include "testutil.h" +#include <nuts.h> void test_dial_before_listen(void) { - nng_socket push; - nng_socket pull; - char addr[64]; + nng_socket s1; + nng_socket s2; + char *addr; - testutil_scratch_addr("inproc", sizeof(addr), addr); + NUTS_OPEN(s1); + NUTS_OPEN(s2); - TEST_NNG_PASS(nng_push0_open(&push)); - TEST_NNG_PASS(nng_pull0_open(&pull)); + NUTS_ADDR(addr, "inproc"); - TEST_NNG_PASS(nng_socket_set_ms(pull, NNG_OPT_RECONNMINT, 10)); - TEST_NNG_PASS(nng_socket_set_ms(pull, NNG_OPT_RECONNMAXT, 10)); + NUTS_PASS(nng_socket_set_ms(s2, NNG_OPT_RECONNMINT, 10)); + NUTS_PASS(nng_socket_set_ms(s2, NNG_OPT_RECONNMAXT, 10)); - TEST_NNG_PASS(nng_dial(pull, addr, NULL, NNG_FLAG_NONBLOCK)); - testutil_sleep(100); - TEST_NNG_PASS(nng_listen(push, addr, NULL, 0)); + NUTS_PASS(nng_dial(s2, addr, NULL, NNG_FLAG_NONBLOCK)); + NUTS_SLEEP(100); + NUTS_PASS(nng_listen(s1, addr, NULL, 0)); - TEST_NNG_SEND_STR(push, "hello"); - TEST_NNG_RECV_STR(pull, "hello"); + NUTS_SEND(s1, "hello"); + NUTS_RECV(s2, "hello"); - TEST_NNG_PASS(nng_close(push)); - TEST_NNG_PASS(nng_close(pull)); + NUTS_CLOSE(s1); + NUTS_CLOSE(s2); } void test_reconnect(void) { - nng_socket push; - nng_socket pull; + nng_socket s1; + nng_socket s2; nng_listener l; - char addr[64]; + char *addr; - testutil_scratch_addr("inproc", sizeof(addr), addr); + NUTS_OPEN(s1); + NUTS_OPEN(s2); - TEST_NNG_PASS(nng_push0_open(&push)); - TEST_NNG_PASS(nng_pull0_open(&pull)); + NUTS_ADDR(addr, "inproc"); - TEST_NNG_PASS(nng_socket_set_ms(pull, NNG_OPT_RECONNMINT, 10)); - TEST_NNG_PASS(nng_socket_set_ms(pull, NNG_OPT_RECONNMAXT, 10)); + NUTS_PASS(nng_socket_set_ms(s2, NNG_OPT_RECONNMINT, 10)); + NUTS_PASS(nng_socket_set_ms(s2, NNG_OPT_RECONNMAXT, 10)); - TEST_NNG_PASS(nng_dial(pull, addr, NULL, NNG_FLAG_NONBLOCK)); - testutil_sleep(100); - TEST_NNG_PASS(nng_listen(push, addr, &l, 0)); + NUTS_PASS(nng_dial(s2, addr, NULL, NNG_FLAG_NONBLOCK)); + NUTS_SLEEP(100); + NUTS_PASS(nng_listen(s1, addr, &l, 0)); - TEST_NNG_SEND_STR(push, "hello"); - TEST_NNG_RECV_STR(pull, "hello"); + NUTS_SEND(s1, "hello"); + NUTS_RECV(s2, "hello"); // Close the listener - TEST_NNG_PASS(nng_listener_close(l)); + NUTS_PASS(nng_listener_close(l)); - TEST_NNG_PASS(nng_listen(push, addr, &l, 0)); - TEST_NNG_SEND_STR(push, "again"); - TEST_NNG_RECV_STR(pull, "again"); + NUTS_PASS(nng_listen(s1, addr, &l, 0)); + NUTS_SEND(s1, "again"); + NUTS_RECV(s2, "again"); - TEST_NNG_PASS(nng_close(push)); - TEST_NNG_PASS(nng_close(pull)); + NUTS_CLOSE(s1); + NUTS_CLOSE(s2); } void test_reconnect_pipe(void) { - nng_socket push; - nng_socket pull; + nng_socket s1; + nng_socket s2; nng_listener l; nng_msg * msg; - char addr[64]; + char * addr; - testutil_scratch_addr("inproc", sizeof(addr), addr); + NUTS_OPEN(s1); + NUTS_OPEN(s2); - TEST_NNG_PASS(nng_push0_open(&push)); - TEST_NNG_PASS(nng_pull0_open(&pull)); + NUTS_ADDR(addr, "inproc"); - TEST_NNG_PASS(nng_socket_set_ms(pull, NNG_OPT_RECONNMINT, 10)); - TEST_NNG_PASS(nng_socket_set_ms(pull, NNG_OPT_RECONNMAXT, 10)); + NUTS_PASS(nng_socket_set_ms(s1, NNG_OPT_RECONNMINT, 10)); + NUTS_PASS(nng_socket_set_ms(s1, NNG_OPT_RECONNMAXT, 10)); - TEST_NNG_PASS(nng_dial(pull, addr, NULL, NNG_FLAG_NONBLOCK)); - testutil_sleep(100); - TEST_NNG_PASS(nng_listen(push, addr, &l, 0)); + NUTS_PASS(nng_dial(s1, addr, NULL, NNG_FLAG_NONBLOCK)); + NUTS_SLEEP(100); + NUTS_PASS(nng_listen(s2, addr, &l, 0)); - TEST_NNG_SEND_STR(push, "hello"); + NUTS_SEND(s2, "hello"); - TEST_NNG_PASS(nng_recvmsg(pull, &msg, 0)); - TEST_CHECK(msg != NULL); - TEST_CHECK(nng_msg_len(msg) == 6); - TEST_CHECK(strcmp(nng_msg_body(msg), "hello") == 0); + NUTS_PASS(nng_recvmsg(s1, &msg, 0)); + NUTS_TRUE(msg != NULL); + NUTS_TRUE(nng_msg_len(msg) == 6); + NUTS_MATCH(nng_msg_body(msg), "hello"); nng_pipe_close(nng_msg_get_pipe(msg)); nng_msg_free(msg); @@ -112,53 +106,54 @@ test_reconnect_pipe(void) // receiver, the receiver might not have got the update. If we // send too soon, then the message gets routed to the sender pipe // that is about to close. - testutil_sleep(100); + NUTS_SLEEP(100); - // Reconnect should happen more ore less immediately. - TEST_NNG_SEND_STR(push, "again"); - TEST_NNG_RECV_STR(pull, "again"); + // Reconnect should happen more or less immediately. + NUTS_SEND(s2, "again"); + NUTS_RECV(s1, "again"); - TEST_NNG_PASS(nng_close(push)); - TEST_NNG_PASS(nng_close(pull)); + NUTS_CLOSE(s1); + NUTS_CLOSE(s2); } void test_reconnect_back_off_zero(void) { - nng_socket push; - nng_socket pull; - nng_time start; - char addr[64]; - testutil_scratch_addr("inproc", sizeof(addr), addr); + nng_socket s1; + nng_socket s2; + uint64_t start; + char * addr; + + NUTS_OPEN(s1); + NUTS_OPEN(s2); - TEST_NNG_PASS(nng_push0_open(&push)); - TEST_NNG_PASS(nng_pull0_open(&pull)); + NUTS_ADDR(addr, "inproc"); // redial every 10 ms. - TEST_NNG_PASS(nng_socket_set_ms(push, NNG_OPT_RECONNMAXT, 0)); - TEST_NNG_PASS(nng_socket_set_ms(push, NNG_OPT_RECONNMINT, 10)); - TEST_NNG_PASS(nng_dial(push, addr, NULL, NNG_FLAG_NONBLOCK)); + NUTS_PASS(nng_socket_set_ms(s1, NNG_OPT_RECONNMAXT, 0)); + NUTS_PASS(nng_socket_set_ms(s1, NNG_OPT_RECONNMINT, 10)); + NUTS_PASS(nng_dial(s1, addr, NULL, NNG_FLAG_NONBLOCK)); // Start up the dialer first. It should keep retrying every 10 ms. // Wait 500 milliseconds. This gives a chance for an exponential // back-off to increase to a longer time. It should by this point // be well over 100 and probably closer to 200 ms. - nng_msleep(500); + NUTS_SLEEP(500); - start = nng_clock(); - TEST_NNG_PASS(nng_listen(pull, addr, NULL, 0)); + NUTS_CLOCK(start); + NUTS_PASS(nng_listen(s2, addr, NULL, 0)); - TEST_NNG_SEND_STR(push, "hello"); - TEST_NNG_RECV_STR(pull, "hello"); + NUTS_SEND(s1, "hello"); + NUTS_RECV(s2, "hello"); - TEST_CHECK(nng_clock() - start < 100); + NUTS_BEFORE(start + 100); - TEST_NNG_PASS(nng_close(push)); - TEST_NNG_PASS(nng_close(pull)); + NUTS_CLOSE(s1); + NUTS_CLOSE(s2); } -TEST_LIST = { +NUTS_TESTS = { { "dial before listen", test_dial_before_listen }, { "reconnect", test_reconnect }, { "reconnect back-off zero", test_reconnect_back_off_zero }, |