aboutsummaryrefslogtreecommitdiffstats
path: root/keystonemiddleware-moon/keystonemiddleware/tests/unit/utils.py
diff options
context:
space:
mode:
authorasteroide <thomas.duval@orange.com>2015-09-24 14:39:09 +0200
committerasteroide <thomas.duval@orange.com>2015-09-24 14:39:09 +0200
commit0be7a3d4e0647dc0d94a34e4fc2f8c364de46602 (patch)
tree14214bb0bbf2430b6ee0df387ddbdbf13c4c4d63 /keystonemiddleware-moon/keystonemiddleware/tests/unit/utils.py
parente35decd4e989773c96a9abb263257291bd51ae1e (diff)
Update code from KeystoneMiddleware Github repository (Master).
Change-Id: Id28c5bf48b3dbb6c8a08e66411b5785029f6857d
Diffstat (limited to 'keystonemiddleware-moon/keystonemiddleware/tests/unit/utils.py')
-rw-r--r--keystonemiddleware-moon/keystonemiddleware/tests/unit/utils.py18
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)