summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorAngus Salkeld <asalkeld@mirantis.com>2016-04-11 10:52:22 +1000
committerAngus Salkeld <asalkeld@mirantis.com>2016-04-11 10:52:22 +1000
commit3ed5948b1c20a000e82bea4cd2af7f4dce039ba9 (patch)
tree551790fb8cbfbe041cc3d602ae88fd575496d5b0 /contrib
parenta607d38f637823d60ac1419659dc4f6ed43cb4cb (diff)
downloadheat-3ed5948b1c20a000e82bea4cd2af7f4dce039ba9.tar.gz
Set enforce_type=True on config overrides in tests
This makes sure that type checking is done by oslo.config on the test override values. Change-Id: Ia8c1cb55fe98e9d06b9b9ff13e5c2d25aa67bff3 Closes-bug: #1517839
Diffstat (limited to 'contrib')
-rw-r--r--contrib/rackspace/heat_keystoneclient_v2/tests/test_client.py8
-rw-r--r--contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py3
2 files changed, 6 insertions, 5 deletions
diff --git a/contrib/rackspace/heat_keystoneclient_v2/tests/test_client.py b/contrib/rackspace/heat_keystoneclient_v2/tests/test_client.py
index f66438ec1..1b680ce40 100644
--- a/contrib/rackspace/heat_keystoneclient_v2/tests/test_client.py
+++ b/contrib/rackspace/heat_keystoneclient_v2/tests/test_client.py
@@ -36,13 +36,13 @@ class KeystoneClientTest(common.HeatTestCase):
dummy_url = 'http://server.test:5000/v2.0'
cfg.CONF.set_override('auth_uri', dummy_url,
- group='keystone_authtoken')
+ group='keystone_authtoken', enforce_type=True)
cfg.CONF.set_override('admin_user', 'heat',
- group='keystone_authtoken')
+ group='keystone_authtoken', enforce_type=True)
cfg.CONF.set_override('admin_password', 'verybadpass',
- group='keystone_authtoken')
+ group='keystone_authtoken', enforce_type=True)
cfg.CONF.set_override('admin_tenant_name', 'service',
- group='keystone_authtoken')
+ group='keystone_authtoken', enforce_type=True)
self.addCleanup(self.m.VerifyAll)
def _stubs_v2(self, method='token', auth_ok=True, trust_scoped=True,
diff --git a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py
index d7f1828a0..5cb1bb855 100644
--- a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py
+++ b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py
@@ -64,7 +64,8 @@ cfg.CONF.import_opt('region_name_for_services', 'heat.common.config')
class CloudServersTest(common.HeatTestCase):
def setUp(self):
super(CloudServersTest, self).setUp()
- cfg.CONF.set_override('region_name_for_services', 'RegionOne')
+ cfg.CONF.set_override('region_name_for_services', 'RegionOne',
+ enforce_type=True)
self.ctx = utils.dummy_context()
self.fc = fakes.FakeClient()