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

Problem: tests bind to hardcoded TCP ports

Browse Source 
Solution: use ZMQ_LAST_ENDPOINT in most places. This alllows running
tests in paralle, and on over-booked shared machines where many of
the ports would be already in use.
Keep 3 tests with an hardcoded port, as there are some code paths that
require it (eg: connect before bind), but list those ports in
tests/testutil.hpp as macros so that they do not overlap and still
allow parallel runs.

These changes were inspired by a patch uploaded to Ubuntu by the
package maintainer, Steve Langasek <steve.langasek@ubuntu.com>.
Thank you Steve!
This commit is contained in:
Luca Boccassi
2017-05-01 12:11:11 +01:00
parent ae461dc2a9
commit 5934919f3e
51 changed files with 792 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/test_router_handover.cpp
View File

@@ -1,5 +1,5 @@
/*
Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
This file is part of libzmq, the ZeroMQ core engine in C++.
@@ -32,12 +32,17 @@
int main (void)
{
setup_test_environment();
size_t len = MAX_SOCKET_STRING;
char my_endpoint[MAX_SOCKET_STRING];
void *ctx = zmq_ctx_new ();
assert (ctx);
void *router = zmq_socket (ctx, ZMQ_ROUTER);
assert (router);
int rc = zmq_bind (router, "tcp://127.0.0.1:5560");
int rc = zmq_bind (router, "tcp://127.0.0.1:*");
assert (rc == 0);
rc = zmq_getsockopt (router, ZMQ_LAST_ENDPOINT, my_endpoint, &len);
assert (rc == 0);
// Enable the handover flag
@@ -50,7 +55,7 @@ int main (void)
assert (dealer_one);
rc = zmq_setsockopt (dealer_one, ZMQ_IDENTITY, "X", 1);
assert (rc == 0);
rc = zmq_connect (dealer_one, "tcp://127.0.0.1:5560");
rc = zmq_connect (dealer_one, my_endpoint);
assert (rc == 0);
// Get message from dealer to know when connection is ready
@@ -68,7 +73,7 @@ int main (void)
assert (dealer_two);
rc = zmq_setsockopt (dealer_two, ZMQ_IDENTITY, "X", 1);
assert (rc == 0);
rc = zmq_connect (dealer_two, "tcp://127.0.0.1:5560");
rc = zmq_connect (dealer_two, my_endpoint);
assert (rc == 0);
// Get message from dealer to know when connection is ready