diff options
-rw-r--r-- | oslo_middleware/base.py | 10 | ||||
-rw-r--r-- | oslo_middleware/tests/test_cors.py | 3 | ||||
-rw-r--r-- | oslo_middleware/tests/test_ssl.py | 12 |
3 files changed, 17 insertions, 8 deletions
diff --git a/oslo_middleware/base.py b/oslo_middleware/base.py index fd45d9a..86f2249 100644 --- a/oslo_middleware/base.py +++ b/oslo_middleware/base.py @@ -31,7 +31,15 @@ class ConfigurableMiddleware(object): @classmethod def factory(cls, global_conf, **local_conf): - """Factory method for paste.deploy.""" + """Factory method for paste.deploy. + + :param global_conf: dict of options for all middlewares + (usually the [DEFAULT] section of the paste deploy + configuration file) + :param local_conf: options dedicated to this middleware + (usually the option defined in the middleware + section of the paste deploy configuration file) + """ conf = global_conf.copy() if global_conf else {} conf.update(local_conf) diff --git a/oslo_middleware/tests/test_cors.py b/oslo_middleware/tests/test_cors.py index 196e302..4b8ffb0 100644 --- a/oslo_middleware/tests/test_cors.py +++ b/oslo_middleware/tests/test_cors.py @@ -115,8 +115,7 @@ class CORSTestFilterFactory(test_base.BaseTestCase): """Test the CORS filter_factory method.""" def test_filter_factory(self): - config = self.useFixture(fixture.Config()) - config.conf([]) + self.useFixture(fixture.Config()).conf([]) # Test a valid filter. filter = cors.filter_factory(None, diff --git a/oslo_middleware/tests/test_ssl.py b/oslo_middleware/tests/test_ssl.py index a94e4c4..810503d 100644 --- a/oslo_middleware/tests/test_ssl.py +++ b/oslo_middleware/tests/test_ssl.py @@ -26,11 +26,11 @@ class SSLMiddlewareTest(base.BaseTestCase): super(SSLMiddlewareTest, self).setUp() self.useFixture(config.Config()) - def _test_scheme(self, expected, headers, config=None): + def _test_scheme(self, expected, headers, secure_proxy_ssl_header=None): middleware = ssl.SSLMiddleware(None) - if config: + if secure_proxy_ssl_header: middleware.oslo_conf.set_override( - 'secure_proxy_ssl_header', config, + 'secure_proxy_ssl_header', secure_proxy_ssl_header, group='oslo_middleware') request = webob.Request.blank('http://example.com/', headers=headers) @@ -48,8 +48,10 @@ class SSLMiddlewareTest(base.BaseTestCase): def test_with_custom_header(self): headers = {'X-Forwarded-Proto': 'https'} - self._test_scheme('http', headers, config='X-My-Header') + self._test_scheme('http', headers, + secure_proxy_ssl_header='X-My-Header') def test_with_custom_header_and_forwarded_protocol(self): headers = {'X-My-Header': 'https'} - self._test_scheme('https', headers, config='X-My-Header') + self._test_scheme('https', headers, + secure_proxy_ssl_header='X-My-Header') |