diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-05 12:26:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-05 12:26:33 +0000 |
| commit | 2b9ff78f2c006cc7ba1cfe7b3561beb17d08013e (patch) | |
| tree | 48ecaa750454228bd62197bac762cd85cc25dd87 /nova/tests | |
| parent | 626f64a716651af3654b0f7dedab0a70988e53c5 (diff) | |
| parent | fd49b0ec8933188a489ca9f38beeb601a1108730 (diff) | |
Merge "Use openstack.common.cfg.CONF."
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/__init__.py | 4 | ||||
| -rw-r--r-- | nova/tests/rpc/test_kombu.py | 1 | ||||
| -rw-r--r-- | nova/tests/rpc/test_kombu_ssl.py | 1 | ||||
| -rw-r--r-- | nova/tests/rpc/test_qpid.py | 1 |
4 files changed, 0 insertions, 7 deletions
diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py index d04681935..d1fa17185 100644 --- a/nova/tests/__init__.py +++ b/nova/tests/__init__.py @@ -60,16 +60,12 @@ def reset_db(): def setup(): import mox # Fail fast if you don't have mox. Workaround for bug 810424 - from nova import rpc # Register rpc_backend before fake_flags sets it - FLAGS.register_opts(rpc.rpc_opts) - from nova import context from nova import db from nova.db import migration from nova.network import manager as network_manager from nova.tests import fake_flags fake_flags.set_defaults(FLAGS) - rpc.register_opts(FLAGS) if FLAGS.sql_connection == "sqlite://": if migration.db_version() > migration.INIT_VERSION: diff --git a/nova/tests/rpc/test_kombu.py b/nova/tests/rpc/test_kombu.py index a69dcdfe9..0055f253c 100644 --- a/nova/tests/rpc/test_kombu.py +++ b/nova/tests/rpc/test_kombu.py @@ -61,7 +61,6 @@ class RpcKombuTestCase(common.BaseRpcAMQPTestCase): def setUp(self): if kombu: self.rpc = impl_kombu - impl_kombu.register_opts(FLAGS) else: self.rpc = None super(RpcKombuTestCase, self).setUp() diff --git a/nova/tests/rpc/test_kombu_ssl.py b/nova/tests/rpc/test_kombu_ssl.py index e17521981..f74d38492 100644 --- a/nova/tests/rpc/test_kombu_ssl.py +++ b/nova/tests/rpc/test_kombu_ssl.py @@ -44,7 +44,6 @@ class RpcKombuSslTestCase(test.TestCase): def setUp(self): super(RpcKombuSslTestCase, self).setUp() if kombu: - impl_kombu.register_opts(FLAGS) self.flags(kombu_ssl_keyfile=SSL_KEYFILE, kombu_ssl_ca_certs=SSL_CA_CERT, kombu_ssl_certfile=SSL_CERT, diff --git a/nova/tests/rpc/test_qpid.py b/nova/tests/rpc/test_qpid.py index c523f3fe3..1b21158f8 100644 --- a/nova/tests/rpc/test_qpid.py +++ b/nova/tests/rpc/test_qpid.py @@ -66,7 +66,6 @@ class RpcQpidTestCase(test.TestCase): self.mock_receiver = None if qpid: - impl_qpid.register_opts(FLAGS) self.orig_connection = qpid.messaging.Connection self.orig_session = qpid.messaging.Session self.orig_sender = qpid.messaging.Sender |