generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-19 16:56:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #932 from ricnewton/master

Browse Source 
Remove delays in test_connect_rid and destroy/recreate context between tests
This commit is contained in:
Ian Barber 2014-03-17 14:41:14 +00:00
commit 65c0ed4727
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/test_connect_rid.cpp
View File

@ -20,16 +20,17 @@
#include "testutil.hpp" #include "testutil.hpp"
void test_stream_2_stream(void* ctx_){ void test_stream_2_stream(){
void *rbind, *rconn1; void *rbind, *rconn1;
int ret; int ret;
char buff[256]; char buff[256];
char msg[] = "hi 1"; char msg[] = "hi 1";
const char *bindip = "tcp://127.0.0.1:5556"; const char *bindip = "tcp://127.0.0.1:5556";
int zero = 0; int zero = 0;
void *ctx = zmq_ctx_new ();
// Set up listener STREAM. // Set up listener STREAM.
rbind = zmq_socket (ctx_, ZMQ_STREAM); rbind = zmq_socket (ctx, ZMQ_STREAM);
assert (rbind); assert (rbind);
ret = zmq_setsockopt (rbind, ZMQ_LINGER, &zero, sizeof (zero)); ret = zmq_setsockopt (rbind, ZMQ_LINGER, &zero, sizeof (zero));
assert (0 == ret); assert (0 == ret);
@ -37,7 +38,7 @@ void test_stream_2_stream(void* ctx_){
assert(0 == ret); assert(0 == ret);
// Set up connection stream. // Set up connection stream.
rconn1 = zmq_socket (ctx_, ZMQ_STREAM); rconn1 = zmq_socket (ctx, ZMQ_STREAM);
assert (rconn1); assert (rconn1);
ret = zmq_setsockopt (rconn1, ZMQ_LINGER, &zero, sizeof (zero)); ret = zmq_setsockopt (rconn1, ZMQ_LINGER, &zero, sizeof (zero));
assert (0 == ret); assert (0 == ret);
@ -81,15 +82,18 @@ void test_stream_2_stream(void* ctx_){
assert(0 == ret); assert(0 == ret);
ret = zmq_close (rconn1); ret = zmq_close (rconn1);
assert(0 == ret); assert(0 == ret);
zmq_ctx_destroy (ctx);
} }
void test_router_2_router(void* ctx,bool named){ void test_router_2_router(bool named){
void *rbind, *rconn1; void *rbind, *rconn1;
int ret; int ret;
char buff[256]; char buff[256];
char msg[] = "hi 1"; char msg[] = "hi 1";
const char *bindip = "tcp://127.0.0.1:5556"; const char *bindip = "tcp://127.0.0.1:5556";
int zero = 0; int zero = 0;
void *ctx = zmq_ctx_new ();
// Create bind socket. // Create bind socket.
rbind = zmq_socket (ctx, ZMQ_ROUTER); rbind = zmq_socket (ctx, ZMQ_ROUTER);
@ -164,21 +168,17 @@ void test_router_2_router(void* ctx,bool named){
assert(0 == ret); assert(0 == ret);
ret = zmq_close (rconn1); ret = zmq_close (rconn1);
assert(0 == ret); assert(0 == ret);
zmq_ctx_destroy (ctx);
} }
int main (void) int main (void)
{ {
void *ctx;
setup_test_environment (); setup_test_environment ();
ctx = zmq_ctx_new ();
assert (ctx); test_stream_2_stream ();
test_stream_2_stream (ctx); test_router_2_router (false);
msleep(100); // Give time for bound socket to be closed. test_router_2_router (true);
test_router_2_router (ctx, false);
msleep(100); // Give time for bound socket to be closed.
test_router_2_router (ctx, true);
zmq_ctx_destroy (ctx);
printf ("'test_connect_rid' passed");
return 0; return 0;
} }