diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-01-14 08:36:53 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-01-15 16:42:25 +0000 |
| commit | 4a6ef49850336bc8a99f0b93feee0307f0383b1f (patch) | |
| tree | ab32e49aeedbc422ccac02f80a833f9950cdaea6 /tests | |
| parent | 9827528b14bbc92ead4456a967bdc7f77eaa696a (diff) | |
| download | oslo-4a6ef49850336bc8a99f0b93feee0307f0383b1f.tar.gz oslo-4a6ef49850336bc8a99f0b93feee0307f0383b1f.tar.xz oslo-4a6ef49850336bc8a99f0b93feee0307f0383b1f.zip | |
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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/rpc/test_zmq.py | 1 |
1 files changed, 0 insertions, 1 deletions
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 |