diff options
author | Eric Windisch <eric@cloudscaling.com> | 2013-01-10 22:56:57 -0500 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-01-13 05:39:55 +0000 |
commit | 8a187ecc010d90ba000632d97999624ee8dee130 (patch) | |
tree | 4300330226eee1eff7ef7a99c652d03499659d09 /tests/unit/rpc/test_zmq.py | |
parent | d74668fbedc29aa4b7868fd3fb8a28d326f43d52 (diff) | |
download | oslo-8a187ecc010d90ba000632d97999624ee8dee130.tar.gz oslo-8a187ecc010d90ba000632d97999624ee8dee130.tar.xz oslo-8a187ecc010d90ba000632d97999624ee8dee130.zip |
reusable ZmqProxy service initialization
Move near-identical proxy setup code
from oslo-zmq-receiver and test_zmq
into ZmqProxy's consume_in_thread method
Provides code reuse and simplifies the
tests and receiver binary.
Change-Id: I1324eacfa2a456599d5fd462b6476ddf659e95c4
Diffstat (limited to 'tests/unit/rpc/test_zmq.py')
-rw-r--r-- | tests/unit/rpc/test_zmq.py | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/tests/unit/rpc/test_zmq.py b/tests/unit/rpc/test_zmq.py index d43c384..d120bb2 100644 --- a/tests/unit/rpc/test_zmq.py +++ b/tests/unit/rpc/test_zmq.py @@ -75,7 +75,8 @@ class _RpcZmqBaseTestCase(common.BaseRpcTestCase): self.config(rpc_zmq_ipc_dir=internal_ipc_dir) LOG.info(_("Running internal zmq receiver.")) - self.setup_receiver(internal_ipc_dir) + reactor = impl_zmq.ZmqProxy(FLAGS) + reactor.consume_in_thread() else: LOG.warning(_("Detected zmq-receiver socket.")) LOG.warning(_("Assuming nova-rpc-zmq-receiver is running.")) @@ -84,32 +85,6 @@ class _RpcZmqBaseTestCase(common.BaseRpcTestCase): super(_RpcZmqBaseTestCase, self).setUp( topic=topic, topic_nested=topic_nested) - def setup_receiver(self, ipc_dir): - # Only launch the receiver if it isn't running independently. - # This is checked again, with the (possibly) new ipc_dir. - if not os.path.isdir(ipc_dir): - try: - os.mkdir(ipc_dir) - except OSError: - LOG.error(_("Could not create IPC directory %s") % (ipc_dir, )) - raise - try: - self.reactor = impl_zmq.ZmqProxy(FLAGS) - consume_in = "tcp://%s:%s" % \ - (FLAGS.rpc_zmq_bind_address, - FLAGS.rpc_zmq_port) - consumption_proxy = impl_zmq.InternalContext(None) - - self.reactor.register(consumption_proxy, - consume_in, - zmq.PULL, - out_bind=True) - self.reactor.consume_in_thread() - except zmq.ZMQError: - LOG.error(_("Could not create ZeroMQ receiver daemon. " - "Socket may already be in use.")) - raise - @testutils.skip_if(not impl_zmq, "ZeroMQ library required") def tearDown(self): if self.reactor: |