Merge "Remove unused group parameter from tests"

This commit is contained in:
Jenkins 2015-10-13 07:09:22 +00:00 committed by Gerrit Code Review
commit 0f31eb0449

View File

@ -27,17 +27,16 @@ class BaseUserPluginTests(object):
def configure_middleware(self, def configure_middleware(self,
auth_plugin, auth_plugin,
group='keystone_authtoken',
**kwargs): **kwargs):
opts = auth.get_plugin_class(auth_plugin).get_options() opts = auth.get_plugin_class(auth_plugin).get_options()
self.cfg.register_opts(opts, group=group) self.cfg.register_opts(opts, group=_base.AUTHTOKEN_GROUP)
# Since these tests cfg.config() themselves rather than waiting for # Since these tests cfg.config() themselves rather than waiting for
# auth_token to do it on __init__ we need to register the base auth # auth_token to do it on __init__ we need to register the base auth
# options (e.g., auth_plugin) # options (e.g., auth_plugin)
auth.register_conf_options(self.cfg.conf, group=_base.AUTHTOKEN_GROUP) auth.register_conf_options(self.cfg.conf, group=_base.AUTHTOKEN_GROUP)
self.cfg.config(group=group, self.cfg.config(group=_base.AUTHTOKEN_GROUP,
auth_plugin=auth_plugin, auth_plugin=auth_plugin,
**kwargs) **kwargs)