Update code from KeystoneMiddleware Github repository (Master).

Change-Id: Id28c5bf48b3dbb6c8a08e66411b5785029f6857d

1 files changed, 15 insertions, 3 deletions

diff --git a/keystonemiddleware-moon/keystonemiddleware/tests/unit/utils.py b/keystonemiddleware-moon/keystonemiddleware/tests/unit/utils.py
index da6f347a..8c6c0e9a 100644
--- a/keystonemiddleware-moon/keystonemiddleware/tests/unit/utils.py
+++ b/keystonemiddleware-moon/keystonemiddleware/tests/unit/utils.py
@@ -13,15 +13,27 @@
 import logging
 import sys
 import time
+import warnings
 
 import fixtures
 import mock
+import oslotest.base as oslotest
 import requests
-import testtools
 import uuid
 
 
-class TestCase(testtools.TestCase):
+class BaseTestCase(oslotest.BaseTestCase):
+    def setUp(self):
+        super(BaseTestCase, self).setUp()
+
+        # If keystonemiddleware calls any deprecated function this will raise
+        # an exception.
+        warnings.filterwarnings('error', category=DeprecationWarning,
+                                module='^keystonemiddleware\\.')
+        self.addCleanup(warnings.resetwarnings)
+
+
+class TestCase(BaseTestCase):
     TEST_DOMAIN_ID = '1'
     TEST_DOMAIN_NAME = 'aDomain'
     TEST_GROUP_ID = uuid.uuid4().hex
@@ -108,7 +120,7 @@ class DisableModuleFixture(fixtures.Fixture):
 
     def clear_module(self):
         cleared_modules = {}
-        for fullname in sys.modules.keys():
+        for fullname in list(sys.modules.keys()):
             if (fullname == self.module or
                     fullname.startswith(self.module + '.')):
                 cleared_modules[fullname] = sys.modules.pop(fullname)