diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-16 14:44:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-16 14:44:49 +0000 |
| commit | be105f79c7056861845e7eb7bf8b4851dba2b1dd (patch) | |
| tree | 90bbf509ab4e0c6b9c29f120f909787d50712912 | |
| parent | 34e20feb38a0d0866c6b469043a005b39daa8211 (diff) | |
| parent | 4d458c0397cf9edd44ac6ce8d94a002a8a8e5286 (diff) | |
| download | oslo-be105f79c7056861845e7eb7bf8b4851dba2b1dd.tar.gz oslo-be105f79c7056861845e7eb7bf8b4851dba2b1dd.tar.xz oslo-be105f79c7056861845e7eb7bf8b4851dba2b1dd.zip | |
Merge "Use self.config in test_zmq"
| -rw-r--r-- | tests/unit/rpc/test_zmq.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/unit/rpc/test_zmq.py b/tests/unit/rpc/test_zmq.py index 058737f..cccbe5f 100644 --- a/tests/unit/rpc/test_zmq.py +++ b/tests/unit/rpc/test_zmq.py @@ -44,7 +44,6 @@ FLAGS = cfg.CONF class _RpcZmqBaseTestCase(common.BaseRpcTestCase): -# @testutils.skip_if(zmq is None, "Test requires zmq") @testutils.skip_if(True, "Zmq tests broken on jenkins") def setUp(self, topic='test', topic_nested='nested'): if not impl_zmq: @@ -53,11 +52,10 @@ class _RpcZmqBaseTestCase(common.BaseRpcTestCase): self.reactor = None self.rpc = impl_zmq - FLAGS.set_override('rpc_zmq_bind_address', '127.0.0.1') - FLAGS.set_override('rpc_zmq_host', '127.0.0.1') - FLAGS.set_override('rpc_response_timeout', 5) - FLAGS.set_default('rpc_zmq_matchmaker', - 'mod_matchmaker.MatchMakerLocalhost') + 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 @@ -70,7 +68,7 @@ class _RpcZmqBaseTestCase(common.BaseRpcTestCase): LOG.info(_("Running internal zmq receiver.")) # The normal ipc_dir default needs to run as root, # /tmp is easier within a testing environment. - FLAGS.set_default('rpc_zmq_ipc_dir', internal_ipc_dir) + self.config(rpc_zmq_ipc_dir=internal_ipc_dir) # Value has changed. ipc_dir = FLAGS.rpc_zmq_ipc_dir |