Fix the PUB/SUB tests

lopter · lopter · commit 9da0db84b0de · 2012-12-29T11:15:02.000+01:00
FX kindly reminded that the Subscriber must be reading on the ZMQ socket
*before* the send from the publisher to get the message. In other words,
the test failures were a perfectly expected behavior from ZMQ.

Thus, this changeset add some retry logic to give the time to the
subscriber.run coroutine to trigger a read.
diff --git a/tests/test_middleware.py b/tests/test_middleware.py
@@ -31,7 +31,7 @@
 
 from zerorpc import zmq
 import zerorpc
-from testutils import teardown, random_ipc_endpoint, skip
+from testutils import teardown, random_ipc_endpoint
 
 
 def test_resolve_endpoint():
@@ -343,7 +343,6 @@ def echo(self, msg):
             ]
 
 
-@skip("PUB/SUB is badly broken in ZMQ and make this test fails")
 def test_task_context_pubsub():
     endpoint = random_ipc_endpoint()
     subscriber_ctx = zerorpc.Context()
@@ -368,8 +367,12 @@ def echo(self, msg):
     c.connect(endpoint)
 
     trigger.clear()
-    c.echo('pub...')
-    trigger.wait()
+    # We need this retry logic to wait that the subscriber.run coroutine starts
+    # reading (the published messages will go to /dev/null until then).
+    for attempt in xrange(0, 10):
+        c.echo('pub...')
+        if trigger.wait(0.2):
+            break
 
     subscriber.stop()
     subscriber_task.join()
diff --git a/tests/test_pubpush.py b/tests/test_pubpush.py
@@ -27,7 +27,7 @@
 import gevent.event
 import zerorpc
 
-from testutils import teardown, random_ipc_endpoint, skip
+from testutils import teardown, random_ipc_endpoint
 
 
 def test_pushpull_inheritance():
@@ -53,7 +53,6 @@ def lolita(self, a, b):
     print 'done'
 
 
-@skip("PUB/SUB is badly broken in ZMQ and make this test fails")
 def test_pubsub_inheritance():
     endpoint = random_ipc_endpoint()
 
@@ -72,10 +71,15 @@ def lolita(self, a, b):
     gevent.spawn(subscriber.run)
 
     trigger.clear()
-    publisher.lolita(1, 2)
-    trigger.wait()
-    print 'done'
+    # We need this retry logic to wait that the subscriber.run coroutine starts
+    # reading (the published messages will go to /dev/null until then).
+    for attempt in xrange(0, 10):
+        publisher.lolita(1, 2)
+        if trigger.wait(0.2):
+            print 'done'
+            return
 
+    raise RuntimeError("The subscriber didn't receive any published message")
 
 def test_pushpull_composite():
     endpoint = random_ipc_endpoint()
@@ -101,7 +105,6 @@ def lolita(self, a, b):
     print 'done'
 
 
-@skip("PUB/SUB is badly broken in ZMQ and make this test fails")
 def test_pubsub_composite():
     endpoint = random_ipc_endpoint()
     trigger = gevent.event.Event()
@@ -121,6 +124,12 @@ def lolita(self, a, b):
     gevent.spawn(subscriber.run)
 
     trigger.clear()
-    publisher.lolita(1, 2)
-    trigger.wait()
-    print 'done'
+    # We need this retry logic to wait that the subscriber.run coroutine starts
+    # reading (the published messages will go to /dev/null until then).
+    for attempt in xrange(0, 10):
+        publisher.lolita(1, 2)
+        if trigger.wait(0.2):
+            print 'done'
+            return
+
+    raise RuntimeError("The subscriber didn't receive any published message")
