Merge "Moves auth plugin test setup closer to its use"

keystone/tests/unit/core.py

@@ -638,13 +638,6 @@ class TestCase(BaseTestCase):
                 'keystone.notifications=INFO',
                 'keystone.identity.backends.ldap.common=INFO',
             ])
-        self.auth_plugin_config_override()
-
-    def auth_plugin_config_override(self, methods=None, **method_classes):
-        self.useFixture(
-            ksfixtures.ConfigAuthPlugins(self.config_fixture,
-                                         methods,
-                                         **method_classes))
 
     def _assert_config_overrides_called(self):
         assert self.__config_overrides_called is True
@@ -693,9 +686,6 @@ class TestCase(BaseTestCase):
         self.addCleanup(notifications.clear_subscribers)
         self.addCleanup(notifications.reset_notifier)
 
-        # Reset the auth-plugin registry
-        self.addCleanup(self.clear_auth_plugin_registry)
-
         self.addCleanup(setattr, controllers, '_VERSIONS', [])
 
     def config(self, config_files):

keystone/tests/unit/rest.py

@@ -16,9 +16,9 @@ from oslo_serialization import jsonutils
 from six.moves import http_client
 import webtest
 
-from keystone.auth import controllers as auth_controllers
 from keystone.tests import unit
 from keystone.tests.unit import default_fixtures
+from keystone.tests.unit import ksfixtures
 from keystone.tests.unit.ksfixtures import database
 
 
@@ -58,8 +58,7 @@ class RestfulTestCase(unit.TestCase):
     def setUp(self, app_conf='keystone'):
         super(RestfulTestCase, self).setUp()
 
-        # Will need to reset the plug-ins
-        self.addCleanup(setattr, auth_controllers, 'AUTH_METHODS', {})
+        self.auth_plugin_config_override()
 
         self.useFixture(database.Database(self.sql_driver_version_overrides))
         self.load_backends()
@@ -72,6 +71,12 @@ class RestfulTestCase(unit.TestCase):
             self.loadapp(app_conf, name='admin'))
         self.addCleanup(delattr, self, 'admin_app')
 
+    def auth_plugin_config_override(self, methods=None, **method_classes):
+        self.useFixture(
+            ksfixtures.ConfigAuthPlugins(self.config_fixture,
+                                         methods,
+                                         **method_classes))
+
     def request(self, app, path, body=None, headers=None, token=None,
                 expected_status=None, **kwargs):
         if headers: