summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-08-28 08:44:12 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-08-28 08:44:12 +0200
commit92923cd40b645af844c5ed1055a0a45c6daa3c89 (patch)
tree9543dfec1918d142dd757bcf1378af65ecea6e3d /tests
parent035c937ee7452708a9dd3abd851fda6a753808f4 (diff)
bug in pipe deactivation fixed
Diffstat (limited to 'tests')
-rw-r--r--tests/test_pair.cpp7
-rw-r--r--tests/test_reqrep.cpp4
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/test_pair.cpp b/tests/test_pair.cpp
index 381874f..c10e0a6 100644
--- a/tests/test_pair.cpp
+++ b/tests/test_pair.cpp
@@ -39,9 +39,10 @@ int main ()
{
const string returned = zmqtestutil::ping_pong (p, expect);
assert (expect == returned);
+
// Adjust socket state so that poll shows only 1 pending message.
zmq::message_t mx ;
- p.first->recv(&mx, 0);
+ p.first->recv (&mx, 0);
}
{
@@ -58,8 +59,7 @@ int main ()
p.first->send (m1, 0);
- // Now use polling. Timout makes test abort on error.
- int rc = zmq::poll (&items [0], 2, 1000);
+ int rc = zmq::poll (&items [0], 2, -1);
assert (rc == 1);
assert ((items [1].revents & ZMQ_POLLIN) != 0);
@@ -74,4 +74,5 @@ int main ()
delete (p.second);
return 0 ;
+assert (false);
}
diff --git a/tests/test_reqrep.cpp b/tests/test_reqrep.cpp
index f33b4b5..eab7e8b 100644
--- a/tests/test_reqrep.cpp
+++ b/tests/test_reqrep.cpp
@@ -39,6 +39,7 @@ int main()
{
const string returned = zmqtestutil::ping_pong (p, expect);
assert (expect == returned);
+
// Adjust socket state, so that first is clean for another send.
zmq::message_t mx ;
p.first->recv(&mx, 0);
@@ -58,8 +59,7 @@ int main()
p.first->send (m1, 0);
- // Now use polling. Timout makes test abort on error.
- int rc = zmq::poll(&items [0], 2, 1000);
+ int rc = zmq::poll(&items [0], 2, -1);
assert (rc == 1);
assert ((items [1].revents & ZMQ_POLLIN) != 0);