From 8a0043f5d63c7f918eb103d7922ff6a1c2c5d588 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Fri, 6 Sep 2013 11:35:38 +1200 Subject: [PATCH] Run cfg.CONF.reset() on test cleanup This means clear_override and clear_default do not need to be called explicitly for each set_override and set_default call. This also fixes any potential test execution order issues where an option has been set without being cleared at all. Change-Id: Ic40c3be10b32eb3011bc0733cee9c1faaf8f1240 Fixes-Bug: #1221476 --- heat/tests/common.py | 1 + heat/tests/test_auth_password.py | 5 ----- heat/tests/test_heatclient.py | 9 --------- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/heat/tests/common.py b/heat/tests/common.py index 97df88a8..f09fe8c0 100644 --- a/heat/tests/common.py +++ b/heat/tests/common.py @@ -45,3 +45,4 @@ class HeatTestCase(testtools.TestCase): 'environment.d') cfg.CONF.set_default('environment_dir', env_dir) + self.addCleanup(cfg.CONF.reset) diff --git a/heat/tests/test_auth_password.py b/heat/tests/test_auth_password.py index aba9b2b5..75a99a36 100644 --- a/heat/tests/test_auth_password.py +++ b/heat/tests/test_auth_password.py @@ -82,11 +82,6 @@ class KeystonePasswordAuthProtocolTest(HeatTestCase): expected_env={'HTTP_X_AUTH_URL': self.config['auth_uri']}) self.middleware = KeystonePasswordAuthProtocol(self.app, self.config) - def tearDown(self): - super(KeystonePasswordAuthProtocolTest, self).tearDown() - cfg.CONF.clear_override('multi_cloud', 'auth_password') - cfg.CONF.clear_override('allowed_auth_uris', 'auth_password') - def _start_fake_response(self, status, headers): self.response_status = int(status.split(' ', 1)[0]) self.response_headers = dict(headers) diff --git a/heat/tests/test_heatclient.py b/heat/tests/test_heatclient.py index e9399364..2605cbb1 100644 --- a/heat/tests/test_heatclient.py +++ b/heat/tests/test_heatclient.py @@ -44,15 +44,6 @@ class KeystoneClientTest(HeatTestCase): group='keystone_authtoken') self.addCleanup(self.m.VerifyAll) - def tearDown(self): - super(KeystoneClientTest, self).tearDown() - cfg.CONF.clear_override('deferred_auth_method') - cfg.CONF.clear_override('auth_uri', group='keystone_authtoken') - cfg.CONF.clear_override('admin_user', group='keystone_authtoken') - cfg.CONF.clear_override('admin_password', group='keystone_authtoken') - cfg.CONF.clear_override('admin_tenant_name', - group='keystone_authtoken') - def _stubs_v2(self, method='token', auth_ok=True): self.m.StubOutClassWithMocks(heat_keystoneclient.kc, "Client") if method == 'token': -- 2.45.2