Merge "Remove usage of parameter enforce_type"

This commit is contained in:
Jenkins 2017-06-02 15:28:31 +00:00 committed by Gerrit Code Review
commit d2fe0563eb
4 changed files with 5 additions and 9 deletions

View File

@ -99,8 +99,7 @@ class ConfigurableMiddleware(object):
def _conf_get(self, key, group="oslo_middleware"):
if key in self.conf:
# Validate value type
self.oslo_conf.set_override(key, self.conf[key], group=group,
enforce_type=True)
self.oslo_conf.set_override(key, self.conf[key], group=group)
return getattr(getattr(self.oslo_conf, group), key)
@staticmethod

View File

@ -44,6 +44,5 @@ class HealthcheckBaseExtension(object):
def _conf_get(self, key, group='healthcheck'):
if key in self.conf:
# Validate value type
self.oslo_conf.set_override(key, self.conf[key], group=group,
enforce_type=True)
self.oslo_conf.set_override(key, self.conf[key], group=group)
return getattr(getattr(self.oslo_conf, group), key)

View File

@ -31,8 +31,7 @@ class TestHTTPProxyToWSGI(test_base.BaseTestCase):
self.middleware = http_proxy_to_wsgi.HTTPProxyToWSGI(fake_app)
self.middleware.oslo_conf.set_override('enable_proxy_headers_parsing',
True,
group='oslo_middleware',
enforce_type=True)
group='oslo_middleware')
self.request = webob.Request.blank('/foo/bar', method='POST')
def test_backward_compat(self):
@ -139,8 +138,7 @@ class TestHTTPProxyToWSGIDisabled(test_base.BaseTestCase):
self.middleware = http_proxy_to_wsgi.HTTPProxyToWSGI(fake_app)
self.middleware.oslo_conf.set_override('enable_proxy_headers_parsing',
False,
group='oslo_middleware',
enforce_type=True)
group='oslo_middleware')
self.request = webob.Request.blank('/foo/bar', method='POST')
def test_no_headers(self):

View File

@ -31,7 +31,7 @@ class SSLMiddlewareTest(base.BaseTestCase):
if secure_proxy_ssl_header:
middleware.oslo_conf.set_override(
'secure_proxy_ssl_header', secure_proxy_ssl_header,
group='oslo_middleware', enforce_type=True)
group='oslo_middleware')
request = webob.Request.blank('http://example.com/', headers=headers)
# Ensure ssl middleware does not stop pipeline execution