aboutsummaryrefslogtreecommitdiffstats
path: root/keystonemiddleware-moon/keystonemiddleware/tests/unit/auth_token/test_auth.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/auth_token/test_auth.py
parente35decd4e989773c96a9abb263257291bd51ae1e (diff)
Update code from KeystoneMiddleware Github repository (Master).
Change-Id: Id28c5bf48b3dbb6c8a08e66411b5785029f6857d
Diffstat (limited to 'keystonemiddleware-moon/keystonemiddleware/tests/unit/auth_token/test_auth.py')
-rw-r--r--keystonemiddleware-moon/keystonemiddleware/tests/unit/auth_token/test_auth.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/keystonemiddleware-moon/keystonemiddleware/tests/unit/auth_token/test_auth.py b/keystonemiddleware-moon/keystonemiddleware/tests/unit/auth_token/test_auth.py
index 517d597b..d6ebc9a0 100644
--- a/keystonemiddleware-moon/keystonemiddleware/tests/unit/auth_token/test_auth.py
+++ b/keystonemiddleware-moon/keystonemiddleware/tests/unit/auth_token/test_auth.py
@@ -18,12 +18,12 @@ from keystoneclient import fixture
from keystoneclient import session
from requests_mock.contrib import fixture as rm_fixture
import six
-import testtools
from keystonemiddleware.auth_token import _auth
+from keystonemiddleware.tests.unit import utils
-class DefaultAuthPluginTests(testtools.TestCase):
+class DefaultAuthPluginTests(utils.BaseTestCase):
def new_plugin(self, auth_host=None, auth_port=None, auth_protocol=None,
auth_admin_prefix=None, admin_user=None,
@@ -50,7 +50,7 @@ class DefaultAuthPluginTests(testtools.TestCase):
self.stream = six.StringIO()
self.logger = logging.getLogger(__name__)
self.session = session.Session()
- self.requests = self.useFixture(rm_fixture.Fixture())
+ self.requests_mock = self.useFixture(rm_fixture.Fixture())
def test_auth_uri_from_fragments(self):
auth_protocol = 'http'
@@ -91,8 +91,8 @@ class DefaultAuthPluginTests(testtools.TestCase):
token = fixture.V2Token()
admin_tenant_name = uuid.uuid4().hex
- self.requests.post(base_uri + '/v2.0/tokens',
- json=token)
+ self.requests_mock.post(base_uri + '/v2.0/tokens',
+ json=token)
plugin = self.new_plugin(identity_uri=base_uri,
admin_user=uuid.uuid4().hex,