Allow BaseTestCase use a different conf object

The new messaging work will register options like rpc_backend and, since
the existing RPC API registers those options with CONF, we need to run
the messaging tests with a different ConfigOpts object.

It's actually probably pretty sane for all unit tests to use a per-test
ConfigOpts object rather than cfg.CONF anyway.

The kombu and zmq tests have an issue with this where they rely on being
able to call self.config() before the base class setUp() is called.
Fixing this properly is a little tricky, so for now, initialize
self.conf early to cfg.CONF just for these tests.

Change-Id: I7b2e3db7c21c511f3ab16ac866e0cc80846cbd80

5 files changed, 41 insertions, 41 deletions

diff --git a/tests/unit/db/sqlalchemy/test_sqlalchemy.py b/tests/unit/db/sqlalchemy/test_sqlalchemy.py
index 46a0cb2..48d6cf7 100644
--- a/tests/unit/db/sqlalchemy/test_sqlalchemy.py
+++ b/tests/unit/db/sqlalchemy/test_sqlalchemy.py
@@ -52,15 +52,15 @@ sql_max_overflow=50
 sql_connection_debug=60
 sql_connection_trace=True
 """)])
-        test_utils.CONF(['--config-file', paths[0]])
-        self.assertEquals(test_utils.CONF.database.connection, 'x://y.z')
-        self.assertEquals(test_utils.CONF.database.min_pool_size, 10)
-        self.assertEquals(test_utils.CONF.database.max_pool_size, 20)
-        self.assertEquals(test_utils.CONF.database.max_retries, 30)
-        self.assertEquals(test_utils.CONF.database.retry_interval, 40)
-        self.assertEquals(test_utils.CONF.database.max_overflow, 50)
-        self.assertEquals(test_utils.CONF.database.connection_debug, 60)
-        self.assertEquals(test_utils.CONF.database.connection_trace, True)
+        self.conf(['--config-file', paths[0]])
+        self.assertEquals(self.conf.database.connection, 'x://y.z')
+        self.assertEquals(self.conf.database.min_pool_size, 10)
+        self.assertEquals(self.conf.database.max_pool_size, 20)
+        self.assertEquals(self.conf.database.max_retries, 30)
+        self.assertEquals(self.conf.database.retry_interval, 40)
+        self.assertEquals(self.conf.database.max_overflow, 50)
+        self.assertEquals(self.conf.database.connection_debug, 60)
+        self.assertEquals(self.conf.database.connection_trace, True)
 
     def test_session_parameters(self):
         paths = self.create_tempfiles([('test', """[database]
@@ -74,16 +74,16 @@ connection_debug=60
 connection_trace=True
 pool_timeout=7
 """)])
-        test_utils.CONF(['--config-file', paths[0]])
-        self.assertEquals(test_utils.CONF.database.connection, 'x://y.z')
-        self.assertEquals(test_utils.CONF.database.min_pool_size, 10)
-        self.assertEquals(test_utils.CONF.database.max_pool_size, 20)
-        self.assertEquals(test_utils.CONF.database.max_retries, 30)
-        self.assertEquals(test_utils.CONF.database.retry_interval, 40)
-        self.assertEquals(test_utils.CONF.database.max_overflow, 50)
-        self.assertEquals(test_utils.CONF.database.connection_debug, 60)
-        self.assertEquals(test_utils.CONF.database.connection_trace, True)
-        self.assertEquals(test_utils.CONF.database.pool_timeout, 7)
+        self.conf(['--config-file', paths[0]])
+        self.assertEquals(self.conf.database.connection, 'x://y.z')
+        self.assertEquals(self.conf.database.min_pool_size, 10)
+        self.assertEquals(self.conf.database.max_pool_size, 20)
+        self.assertEquals(self.conf.database.max_retries, 30)
+        self.assertEquals(self.conf.database.retry_interval, 40)
+        self.assertEquals(self.conf.database.max_overflow, 50)
+        self.assertEquals(self.conf.database.connection_debug, 60)
+        self.assertEquals(self.conf.database.connection_trace, True)
+        self.assertEquals(self.conf.database.pool_timeout, 7)
 
     def test_dbapi_database_deprecated_parameters(self):
         paths = self.create_tempfiles([('test',
@@ -97,17 +97,16 @@ pool_timeout=7
                                         'sqlalchemy_max_overflow=101\n'
                                         'sqlalchemy_pool_timeout=5\n'
                                         )])
-
-        test_utils.CONF(['--config-file', paths[0]])
-        self.assertEquals(test_utils.CONF.database.connection,
+        self.conf(['--config-file', paths[0]])
+        self.assertEquals(self.conf.database.connection,
                           'fake_connection')
-        self.assertEquals(test_utils.CONF.database.idle_timeout, 100)
-        self.assertEquals(test_utils.CONF.database.min_pool_size, 99)
-        self.assertEquals(test_utils.CONF.database.max_pool_size, 199)
-        self.assertEquals(test_utils.CONF.database.max_retries, 22)
-        self.assertEquals(test_utils.CONF.database.retry_interval, 17)
-        self.assertEquals(test_utils.CONF.database.max_overflow, 101)
-        self.assertEquals(test_utils.CONF.database.pool_timeout, 5)
+        self.assertEquals(self.conf.database.idle_timeout, 100)
+        self.assertEquals(self.conf.database.min_pool_size, 99)
+        self.assertEquals(self.conf.database.max_pool_size, 199)
+        self.assertEquals(self.conf.database.max_retries, 22)
+        self.assertEquals(self.conf.database.retry_interval, 17)
+        self.assertEquals(self.conf.database.max_overflow, 101)
+        self.assertEquals(self.conf.database.pool_timeout, 5)
 
 
 class SessionErrorWrapperTestCase(test_base.DbTestCase):
diff --git a/tests/unit/db/test_api.py b/tests/unit/db/test_api.py
index f6e0d4c..2a8db3b 100644
--- a/tests/unit/db/test_api.py
+++ b/tests/unit/db/test_api.py
@@ -40,9 +40,9 @@ class DBAPITestCase(test_utils.BaseTestCase):
                                         'dbapi_use_tpool=True\n'
                                         )])
 
-        test_utils.CONF(['--config-file', paths[0]])
-        self.assertEquals(test_utils.CONF.database.backend, 'test_123')
-        self.assertEquals(test_utils.CONF.database.use_tpool, True)
+        self.conf(['--config-file', paths[0]])
+        self.assertEquals(self.conf.database.backend, 'test_123')
+        self.assertEquals(self.conf.database.use_tpool, True)
 
     def test_dbapi_parameters(self):
         paths = self.create_tempfiles([('test',
@@ -51,9 +51,9 @@ class DBAPITestCase(test_utils.BaseTestCase):
                                         'use_tpool=True\n'
                                         )])
 
-        test_utils.CONF(['--config-file', paths[0]])
-        self.assertEquals(test_utils.CONF.database.backend, 'test_123')
-        self.assertEquals(test_utils.CONF.database.use_tpool, True)
+        self.conf(['--config-file', paths[0]])
+        self.assertEquals(self.conf.database.backend, 'test_123')
+        self.assertEquals(self.conf.database.use_tpool, True)
 
     def test_dbapi_api_class_method_and_tpool_false(self):
         backend_mapping = {'test_known': 'tests.unit.db.test_api'}
diff --git a/tests/unit/rpc/test_kombu.py b/tests/unit/rpc/test_kombu.py
index ba88078..3debe52 100644
--- a/tests/unit/rpc/test_kombu.py
+++ b/tests/unit/rpc/test_kombu.py
@@ -70,6 +70,7 @@ class KombuStubs:
     @staticmethod
     def setUp(self):
         if kombu:
+            self.conf = FLAGS
             self.config(fake_rabbit=True)
             self.config(rpc_response_timeout=5)
             self.rpc = impl_kombu
diff --git a/tests/unit/rpc/test_zmq.py b/tests/unit/rpc/test_zmq.py
index b0f0262..c87a040 100644
--- a/tests/unit/rpc/test_zmq.py
+++ b/tests/unit/rpc/test_zmq.py
@@ -60,6 +60,7 @@ class _RpcZmqBaseTestCase(common.BaseRpcTestCase):
         self.reactor = None
         self.rpc = impl_zmq
 
+        self.conf = FLAGS
         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)
diff --git a/tests/utils.py b/tests/utils.py
index 794a3d2..e93c278 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -27,17 +27,16 @@ import testtools
 from openstack.common import exception
 from openstack.common.fixture import moxstubout
 
-CONF = cfg.CONF
-
 
 class BaseTestCase(testtools.TestCase):
 
-    def setUp(self):
+    def setUp(self, conf=cfg.CONF):
         super(BaseTestCase, self).setUp()
         moxfixture = self.useFixture(moxstubout.MoxStubout())
         self.mox = moxfixture.mox
         self.stubs = moxfixture.stubs
-        self.addCleanup(CONF.reset)
+        self.conf = conf
+        self.addCleanup(self.conf.reset)
         self.useFixture(fixtures.FakeLogger('openstack.common'))
         self.useFixture(fixtures.Timeout(30, True))
         self.stubs.Set(exception, '_FATAL_EXCEPTION_FORMAT_ERRORS', True)
@@ -46,7 +45,7 @@ class BaseTestCase(testtools.TestCase):
 
     def tearDown(self):
         super(BaseTestCase, self).tearDown()
-        CONF.reset()
+        self.conf.reset()
         self.stubs.UnsetAll()
         self.stubs.SmartUnsetAll()
 
@@ -79,4 +78,4 @@ class BaseTestCase(testtools.TestCase):
         """
         group = kw.pop('group', None)
         for k, v in kw.iteritems():
-            CONF.set_override(k, v, group)
+            self.conf.set_override(k, v, group)