summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-11 00:28:40 +0000
committerGerrit Code Review <review@openstack.org>2014-09-11 00:28:40 +0000
commitf4542d281ed007db1358757efc030d35f50bd865 (patch)
treeffb7dfb1f9aa8fa7d218f7a89703faa0acb066c0
parent454feca18f6c506b7e7b0e07cbf66cf9b3274f45 (diff)
parentad42c5768b02e9e86a0d1c7888039c785322999f (diff)
downloadkeystonemiddleware-f4542d281ed007db1358757efc030d35f50bd865.tar.gz
Merge "Always supply a username to auth_token tests setup"
-rw-r--r--keystonemiddleware/tests/test_auth_token_middleware.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/keystonemiddleware/tests/test_auth_token_middleware.py b/keystonemiddleware/tests/test_auth_token_middleware.py
index 55e79d0..f392c45 100644
--- a/keystonemiddleware/tests/test_auth_token_middleware.py
+++ b/keystonemiddleware/tests/test_auth_token_middleware.py
@@ -226,6 +226,7 @@ class BaseAuthTokenMiddlewareTest(testtools.TestCase):
'signing_dir': client_fixtures.CERTDIR,
'auth_version': auth_version,
'auth_uri': 'https://keystone.example.com:1234',
+ 'admin_user': uuid.uuid4().hex,
}
self.auth_version = auth_version
@@ -526,6 +527,7 @@ class GeneralAuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
conf = {
'revocation_cache_time': 24,
'auth_uri': 'https://keystone.example.com:1234',
+ 'admin_user': uuid.uuid4().hex
}
middleware = auth_token.AuthProtocol(self.fake_app, conf)
self.assertEqual(middleware._token_revocation_list_cache_timeout,