From 4a6ef49850336bc8a99f0b93feee0307f0383b1f Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 14 Jan 2013 08:36:53 +0000 Subject: Rework zmq setup and cleanup Register config options at import time and remove the register_opts() function. It seems this isn't being used. Add accessor methods for ZMQ_CTXT and matchmaker so that they are lazily created rather than created at import time. Remove the rpc_zmq_matchmaker override in the tests since MatchMakerLocalhost is the default anyway. We were setting it with an incorrect value, but only after the matchmaker had already been created. Change-Id: I2520252c64d70e4c4903e34d07952fed43e70ebe --- tests/unit/rpc/test_zmq.py | 1 - 1 file changed, 1 deletion(-) (limited to 'tests') diff --git a/tests/unit/rpc/test_zmq.py b/tests/unit/rpc/test_zmq.py index d120bb2..1fb624c 100644 --- a/tests/unit/rpc/test_zmq.py +++ b/tests/unit/rpc/test_zmq.py @@ -59,7 +59,6 @@ class _RpcZmqBaseTestCase(common.BaseRpcTestCase): self.config(rpc_zmq_bind_address='127.0.0.1') self.config(rpc_zmq_host='127.0.0.1') self.config(rpc_response_timeout=5) - self.config(rpc_zmq_matchmaker='mod_matchmaker.MatchMakerLocalhost') # We'll change this if we detect no daemon running. ipc_dir = FLAGS.rpc_zmq_ipc_dir -- cgit