openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Add auth_uri in conf to avoid unnecessary warning"

Browse Source
This commit is contained in:
Jenkins
2013-10-04 15:53:17 +00:00
committed by Gerrit Code Review
parent e170955d6d 2dc3d81031
commit 0341f933ca
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
keystoneclient/tests/test_auth_token_middleware.py
View File

@@ -212,7 +212,8 @@ class BaseAuthTokenMiddlewareTest(testtools.TestCase):
'auth_protocol': 'https', 'auth_protocol': 'https',
'auth_admin_prefix': '/testadmin', 'auth_admin_prefix': '/testadmin',
'signing_dir': client_fixtures.CERTDIR, 'signing_dir': client_fixtures.CERTDIR,
'auth_version': auth_version 'auth_version': auth_version,
'auth_uri': 'https://keystone.example.com:1234',
} }
self.response_status = None self.response_status = None
@@ -374,6 +375,7 @@ class NoMemcacheAuthToken(BaseAuthTokenMiddlewareTest):
'auth_host': 'keystone.example.com', 'auth_host': 'keystone.example.com',
'auth_port': 1234, 'auth_port': 1234,
'memcached_servers': 'localhost:11211', 'memcached_servers': 'localhost:11211',
'auth_uri': 'https://keystone.example.com:1234',
} }
auth_token.AuthProtocol(FakeApp(), conf) auth_token.AuthProtocol(FakeApp(), conf)
@@ -402,6 +404,7 @@ class CommonAuthTokenMiddlewareTest(object):
'auth_host': '2001:2013:1:f101::1', 'auth_host': '2001:2013:1:f101::1',
'auth_port': 1234, 'auth_port': 1234,
'auth_protocol': 'http', 'auth_protocol': 'http',
'auth_uri': None,
} }
self.set_middleware(conf=conf) self.set_middleware(conf=conf)
expected_auth_uri = 'http://[2001:2013:1:f101::1]:1234' expected_auth_uri = 'http://[2001:2013:1:f101::1]:1234'
@@ -776,7 +779,8 @@ class CommonAuthTokenMiddlewareTest(object):
def test_config_revocation_cache_timeout(self): def test_config_revocation_cache_timeout(self):
conf = { conf = {
'revocation_cache_time': 24 'revocation_cache_time': 24,
'auth_uri': 'https://keystone.example.com:1234',
} }
middleware = auth_token.AuthProtocol(self.fake_app, conf) middleware = auth_token.AuthProtocol(self.fake_app, conf)
self.assertEquals(middleware.token_revocation_list_cache_timeout, self.assertEquals(middleware.token_revocation_list_cache_timeout,