Merge "Fix mock for v2 test"

keystone/tests/unit/core.py

@@ -859,8 +859,6 @@ class TestCase(BaseTestCase):
         self.addCleanup(notifications.clear_subscribers)
         self.addCleanup(notifications.reset_notifier)
 
-        self.addCleanup(setattr, keystone.api.discovery, '_VERSIONS', [])
-
     def config(self, config_files):
         sql.initialize()
         CONF(args=[], project='keystone', default_config_files=config_files)

keystone/tests/unit/test_versions.py

@@ -17,7 +17,6 @@ import copy
 import functools
 import random
 
-import mock
 from oslo_serialization import jsonutils
 from six.moves import http_client
 from testtools import matchers as tt_matchers
@@ -761,7 +760,6 @@ class VersionTestCase(unit.TestCase):
             self._paste_in_port(expected['version'], 'http://localhost/v3/')
             self.assertEqual(expected, data)
 
-    @mock.patch.object(discovery, '_VERSIONS', ['v3'])
     def test_v2_disabled(self):
         # NOTE(morgan): This test should be kept, v2.0 is removed and should
         # never return, this prevents regression[s]/v2.0 discovery doc