Random ipc endpoint generation function for tests

bombela · bombela · commit 44e99b516424 · 2012-04-02T21:33:58.000-07:00
With proper teardown.
diff --git a/tests/test_buffered_channel.py b/tests/test_buffered_channel.py
@@ -28,10 +28,11 @@
 
 from zerorpc import zmq
 import zerorpc
+from testutils import teardown, random_ipc_endpoint
 
 
 def test_close_server_bufchan():
-    endpoint = 'ipc://test_close_server_bufchan_'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -67,7 +68,7 @@ def test_close_server_bufchan():
 
 
 def test_close_client_bufchan():
-    endpoint = 'ipc://test_close_client_bufchan_'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -103,7 +104,7 @@ def test_close_client_bufchan():
 
 
 def test_heartbeat_can_open_channel_server_close():
-    endpoint = 'ipc://test_heartbeat_can_open_channel_server_close_'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -137,7 +138,7 @@ def test_heartbeat_can_open_channel_server_close():
 
 
 def test_heartbeat_can_open_channel_client_close():
-    endpoint = 'ipc://test_heartbeat_can_open_channel_client_close_'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -171,7 +172,7 @@ def test_heartbeat_can_open_channel_client_close():
 
 
 def test_do_some_req_rep():
-    endpoint = 'ipc://test_do_some_req_rep_'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -219,7 +220,7 @@ def server_do():
 
 
 def test_do_some_req_rep_lost_server():
-    endpoint = 'ipc://test_do_some_req_rep_lost_server_'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -269,7 +270,7 @@ def server_do():
 
 
 def test_do_some_req_rep_lost_client():
-    endpoint = 'ipc://test_do_some_req_rep_lost_client_'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -318,7 +319,7 @@ def server_do():
 
 
 def test_do_some_req_rep_client_timeout():
-    endpoint = 'ipc://test_do_some_req_rep_client_timeout_'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -371,7 +372,7 @@ class CongestionError(Exception):
 
 
 def test_congestion_control_server_pushing():
-    endpoint = 'ipc://test_congestion_control_server_pushing_'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
diff --git a/tests/test_channel.py b/tests/test_channel.py
@@ -25,10 +25,11 @@
 
 from zerorpc import zmq
 import zerorpc
+from testutils import teardown, random_ipc_endpoint
 
 
 def test_events_channel_client_side():
-    endpoint = 'ipc://test_events_channel_client_side'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -53,7 +54,7 @@ def test_events_channel_client_side():
 
 
 def test_events_channel_client_side_server_send_many():
-    endpoint = 'ipc://test_events_channel_client_side_server_send_many'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -80,7 +81,7 @@ def test_events_channel_client_side_server_send_many():
 
 
 def test_events_channel_both_side():
-    endpoint = 'ipc://test_events_channel_both_side'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
diff --git a/tests/test_client_heartbeat.py b/tests/test_client_heartbeat.py
@@ -26,10 +26,11 @@
 import gevent
 
 import zerorpc
+from testutils import teardown, random_ipc_endpoint
 
 
 def test_client_server_hearbeat():
-    endpoint = 'ipc://test_client_server_hearbeat'
+    endpoint = random_ipc_endpoint()
 
     class MySrv(zerorpc.Server):
 
@@ -51,7 +52,7 @@ def slow(self):
 
 
 def test_client_server_activate_heartbeat():
-    endpoint = 'ipc://test_client_server_activate_heartbeat'
+    endpoint = random_ipc_endpoint()
 
     class MySrv(zerorpc.Server):
 
@@ -72,7 +73,7 @@ def lolita(self):
 
 
 def test_client_server_passive_hearbeat():
-    endpoint = 'ipc://test_client_server_passive_hearbeat'
+    endpoint = random_ipc_endpoint()
 
     class MySrv(zerorpc.Server):
 
diff --git a/tests/test_events.py b/tests/test_events.py
@@ -25,7 +25,7 @@
 
 from zerorpc import zmq
 import zerorpc
-
+from testutils import teardown, random_ipc_endpoint
 
 class MokupContext():
     _next_id = 0
@@ -92,7 +92,7 @@ def test_event():
 
 
 def test_events_req_rep():
-    endpoint = 'ipc://test_events_req_rep'
+    endpoint = random_ipc_endpoint()
     server = zerorpc.Events(zmq.REP)
     server.bind(endpoint)
 
@@ -108,7 +108,7 @@ def test_events_req_rep():
 
 
 def test_events_req_rep2():
-    endpoint = 'ipc://test_events_req_rep2'
+    endpoint = random_ipc_endpoint()
     server = zerorpc.Events(zmq.REP)
     server.bind(endpoint)
 
@@ -130,7 +130,7 @@ def test_events_req_rep2():
 
 
 def test_events_dealer_router():
-    endpoint = 'ipc://test_events_dealer_router'
+    endpoint = random_ipc_endpoint()
     server = zerorpc.Events(zmq.XREP)
     server.bind(endpoint)
 
@@ -153,7 +153,7 @@ def test_events_dealer_router():
 
 
 def test_events_push_pull():
-    endpoint = 'ipc://test_events_push_pull'
+    endpoint = random_ipc_endpoint()
     server = zerorpc.Events(zmq.PULL)
     server.bind(endpoint)
 
diff --git a/tests/test_heartbeat.py b/tests/test_heartbeat.py
@@ -28,10 +28,11 @@
 
 from zerorpc import zmq
 import zerorpc
+from testutils import teardown, random_ipc_endpoint
 
 
 def test_close_server_hbchan():
-    endpoint = 'ipc://test_close_server_hbchan_'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -63,7 +64,7 @@ def test_close_server_hbchan():
 
 
 def test_close_client_hbchan():
-    endpoint = 'ipc://test_close_client_hbchan'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -95,7 +96,7 @@ def test_close_client_hbchan():
 
 
 def test_heartbeat_can_open_channel_server_close():
-    endpoint = 'ipc://test_heartbeat_can_open_channel_server_close'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -125,7 +126,7 @@ def test_heartbeat_can_open_channel_server_close():
 
 
 def test_heartbeat_can_open_channel_client_close():
-    endpoint = 'ipc://test_heartbeat_can_open_channel_client_close'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -155,7 +156,7 @@ def test_heartbeat_can_open_channel_client_close():
 
 
 def test_do_some_req_rep():
-    endpoint = 'ipc://test_do_some_req_rep'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -199,7 +200,7 @@ def server_do():
 
 
 def test_do_some_req_rep_lost_server():
-    endpoint = 'ipc://test_do_some_req_rep_lost_server'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -245,7 +246,7 @@ def server_do():
 
 
 def test_do_some_req_rep_lost_client():
-    endpoint = 'ipc://test_do_some_req_rep_lost_client'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
@@ -292,7 +293,7 @@ def server_do():
 
 
 def test_do_some_req_rep_client_timeout():
-    endpoint = 'ipc://test_do_some_req_rep_client_timeout'
+    endpoint = random_ipc_endpoint()
     server_events = zerorpc.Events(zmq.XREP)
     server_events.bind(endpoint)
     server = zerorpc.ChannelMultiplexer(server_events)
diff --git a/tests/test_middleware.py b/tests/test_middleware.py
@@ -28,10 +28,11 @@
 
 from zerorpc import zmq
 import zerorpc
+from testutils import teardown, random_ipc_endpoint
 
 
 def test_resolve_endpoint():
-    test_endpoint = 'ipc://test_resolve_endpoint'
+    test_endpoint = random_ipc_endpoint()
     c = zerorpc.Context()
 
     def resolve(endpoint):
@@ -75,7 +76,7 @@ def resolve_endpoint(self, endpoint):
 
 
 def test_resolve_endpoint_events():
-    test_endpoint = 'ipc://test_resolve_endpoint_events'
+    test_endpoint = random_ipc_endpoint()
     c = zerorpc.Context()
 
     class Resolver():
@@ -107,7 +108,7 @@ def hello(self):
 
 
 def test_raise_error():
-    endpoint = 'ipc://test_raise_error'
+    endpoint = random_ipc_endpoint()
     c = zerorpc.Context()
 
     class DummyRaiser():
@@ -188,7 +189,7 @@ def mangle_arguments(procedure, *args, **kwargs):
     assert c.middleware_call_procedure(test, 'dummy') == \
         'ret_middleware_2:ret_middleware_1:ret_real:DUMMY'
 
-    endpoint = 'ipc://test_call_procedure'
+    endpoint = random_ipc_endpoint()
 
     # client/server
     class Server(zerorpc.Server):
diff --git a/tests/test_pubpush.py b/tests/test_pubpush.py
@@ -27,10 +27,11 @@
 import gevent.event
 
 import zerorpc
+from testutils import teardown, random_ipc_endpoint
 
 
 def test_pushpull_inheritance():
-    endpoint = 'ipc://test_pushpull_inheritance'
+    endpoint = random_ipc_endpoint()
 
     pusher = zerorpc.Pusher()
     pusher.bind(endpoint)
@@ -53,7 +54,7 @@ def lolita(self, a, b):
 
 
 def test_pubsub_inheritance():
-    endpoint = 'ipc://test_pubsub_inheritance'
+    endpoint = random_ipc_endpoint()
 
     publisher = zerorpc.Publisher()
     publisher.bind(endpoint)
@@ -76,7 +77,7 @@ def lolita(self, a, b):
 
 
 def test_pushpull_composite():
-    endpoint = 'ipc://test_pushpull_composite'
+    endpoint = random_ipc_endpoint()
     trigger = gevent.event.Event()
 
     class Puller(object):
@@ -100,7 +101,7 @@ def lolita(self, a, b):
 
 
 def test_pubsub_composite():
-    endpoint = 'ipc://test_pubsub_composite'
+    endpoint = random_ipc_endpoint()
     trigger = gevent.event.Event()
 
     class Subscriber(object):
diff --git a/tests/test_reqstream.py b/tests/test_reqstream.py
@@ -26,10 +26,11 @@
 import gevent
 
 import zerorpc
+from testutils import teardown, random_ipc_endpoint
 
 
 def test_rcp_streaming():
-    endpoint = 'ipc://test_rcp_streaming'
+    endpoint = random_ipc_endpoint()
 
     class MySrv(zerorpc.Server):
 
diff --git a/tests/test_server.py b/tests/test_server.py
diff --git a/tests/test_wrapped_events.py b/tests/test_wrapped_events.py
diff --git a/tests/testutils.py b/tests/testutils.py
