mirror of
https://github.com/zeromq/libzmq.git
synced 2025-10-28 19:52:00 +01:00
Problem: tests do not follow naming style
Solution: apply naming style
This commit is contained in:
@@ -32,9 +32,9 @@
|
||||
const char *bind_address = 0;
|
||||
char connect_address[MAX_SOCKET_STRING];
|
||||
|
||||
void test_fair_queue_in (void *ctx)
|
||||
void test_fair_queue_in (void *ctx_)
|
||||
{
|
||||
void *receiver = zmq_socket (ctx, ZMQ_ROUTER);
|
||||
void *receiver = zmq_socket (ctx_, ZMQ_ROUTER);
|
||||
assert (receiver);
|
||||
|
||||
int timeout = 250;
|
||||
@@ -50,7 +50,7 @@ void test_fair_queue_in (void *ctx)
|
||||
const unsigned char services = 5;
|
||||
void *senders[services];
|
||||
for (unsigned char peer = 0; peer < services; ++peer) {
|
||||
senders[peer] = zmq_socket (ctx, ZMQ_DEALER);
|
||||
senders[peer] = zmq_socket (ctx_, ZMQ_DEALER);
|
||||
assert (senders[peer]);
|
||||
|
||||
rc =
|
||||
@@ -113,43 +113,43 @@ void test_fair_queue_in (void *ctx)
|
||||
msleep (SETTLE_TIME);
|
||||
}
|
||||
|
||||
void test_destroy_queue_on_disconnect (void *ctx)
|
||||
void test_destroy_queue_on_disconnect (void *ctx_)
|
||||
{
|
||||
void *A = zmq_socket (ctx, ZMQ_ROUTER);
|
||||
assert (A);
|
||||
void *a = zmq_socket (ctx_, ZMQ_ROUTER);
|
||||
assert (a);
|
||||
|
||||
int enabled = 1;
|
||||
int rc =
|
||||
zmq_setsockopt (A, ZMQ_ROUTER_MANDATORY, &enabled, sizeof (enabled));
|
||||
zmq_setsockopt (a, ZMQ_ROUTER_MANDATORY, &enabled, sizeof (enabled));
|
||||
assert (rc == 0);
|
||||
|
||||
rc = zmq_bind (A, bind_address);
|
||||
rc = zmq_bind (a, bind_address);
|
||||
assert (rc == 0);
|
||||
size_t len = MAX_SOCKET_STRING;
|
||||
rc = zmq_getsockopt (A, ZMQ_LAST_ENDPOINT, connect_address, &len);
|
||||
rc = zmq_getsockopt (a, ZMQ_LAST_ENDPOINT, connect_address, &len);
|
||||
assert (rc == 0);
|
||||
|
||||
void *B = zmq_socket (ctx, ZMQ_DEALER);
|
||||
assert (B);
|
||||
void *b = zmq_socket (ctx_, ZMQ_DEALER);
|
||||
assert (b);
|
||||
|
||||
rc = zmq_setsockopt (B, ZMQ_ROUTING_ID, "B", 2);
|
||||
rc = zmq_setsockopt (b, ZMQ_ROUTING_ID, "B", 2);
|
||||
assert (rc == 0);
|
||||
|
||||
rc = zmq_connect (B, connect_address);
|
||||
rc = zmq_connect (b, connect_address);
|
||||
assert (rc == 0);
|
||||
|
||||
// Wait for connection.
|
||||
msleep (SETTLE_TIME);
|
||||
|
||||
// Send a message in both directions
|
||||
s_send_seq (A, "B", "ABC", SEQ_END);
|
||||
s_send_seq (B, "DEF", SEQ_END);
|
||||
s_send_seq (a, "B", "ABC", SEQ_END);
|
||||
s_send_seq (b, "DEF", SEQ_END);
|
||||
|
||||
rc = zmq_disconnect (B, connect_address);
|
||||
rc = zmq_disconnect (b, connect_address);
|
||||
assert (rc == 0);
|
||||
|
||||
// Disconnect may take time and need command processing.
|
||||
zmq_pollitem_t poller[2] = {{A, 0, 0, 0}, {B, 0, 0, 0}};
|
||||
zmq_pollitem_t poller[2] = {{a, 0, 0, 0}, {b, 0, 0, 0}};
|
||||
rc = zmq_poll (poller, 2, 100);
|
||||
assert (rc == 0);
|
||||
rc = zmq_poll (poller, 2, 100);
|
||||
@@ -159,31 +159,31 @@ void test_destroy_queue_on_disconnect (void *ctx)
|
||||
zmq_msg_t msg;
|
||||
zmq_msg_init (&msg);
|
||||
|
||||
rc = zmq_send (A, "B", 2, ZMQ_SNDMORE | ZMQ_DONTWAIT);
|
||||
rc = zmq_send (a, "B", 2, ZMQ_SNDMORE | ZMQ_DONTWAIT);
|
||||
assert (rc == -1);
|
||||
assert (errno == EHOSTUNREACH);
|
||||
|
||||
rc = zmq_msg_recv (&msg, A, ZMQ_DONTWAIT);
|
||||
rc = zmq_msg_recv (&msg, a, ZMQ_DONTWAIT);
|
||||
assert (rc == -1);
|
||||
assert (errno == EAGAIN);
|
||||
|
||||
// After a reconnect of B, the messages should still be gone
|
||||
rc = zmq_connect (B, connect_address);
|
||||
rc = zmq_connect (b, connect_address);
|
||||
assert (rc == 0);
|
||||
|
||||
rc = zmq_msg_recv (&msg, A, ZMQ_DONTWAIT);
|
||||
rc = zmq_msg_recv (&msg, a, ZMQ_DONTWAIT);
|
||||
assert (rc == -1);
|
||||
assert (errno == EAGAIN);
|
||||
|
||||
rc = zmq_msg_recv (&msg, B, ZMQ_DONTWAIT);
|
||||
rc = zmq_msg_recv (&msg, b, ZMQ_DONTWAIT);
|
||||
assert (rc == -1);
|
||||
assert (errno == EAGAIN);
|
||||
|
||||
rc = zmq_msg_close (&msg);
|
||||
assert (rc == 0);
|
||||
|
||||
close_zero_linger (A);
|
||||
close_zero_linger (B);
|
||||
close_zero_linger (a);
|
||||
close_zero_linger (b);
|
||||
|
||||
// Wait for disconnects.
|
||||
msleep (SETTLE_TIME);
|
||||
|
||||
Reference in New Issue
Block a user