File keystoneclient-use-requests-for-auth_token-disable-tests.patch of Package python-keystoneclient
--- a/tests/test_auth_token_middleware.py
+++ b/tests/test_auth_token_middleware.py
@@ -692,35 +692,6 @@ class StackResponseAuthTokenMiddlewareTe
def setUp(self):
super(StackResponseAuthTokenMiddlewareTest, self).setUp()
- def test_fetch_revocation_list_with_expire(self):
- # first response to revocation list should return 401 Unauthorized
- # to pretend to be an expired token
- resp1 = FakeHTTPResponse(200, jsonutils.dumps({
- 'access': {
- 'token': {'id': 'admin_token2'},
- },
- }))
- resp2 = FakeHTTPResponse(401, jsonutils.dumps(''))
- resp3 = FakeHTTPResponse(200, jsonutils.dumps({
- 'access': {
- 'token': {'id': 'admin_token2'},
- },
- }))
- resp4 = FakeHTTPResponse(200, SIGNED_REVOCATION_LIST)
-
- # first get_admin_token() call
- FAKE_RESPONSE_STACK.append(resp1)
- # request revocation list, get "unauthorized" due to simulated expired
- # token
- FAKE_RESPONSE_STACK.append(resp2)
- # request a new admin_token
- FAKE_RESPONSE_STACK.append(resp3)
- # request revocation list, get the revocation list properly
- FAKE_RESPONSE_STACK.append(resp4)
-
- fetched_list = jsonutils.loads(self.middleware.fetch_revocation_list())
- self.assertEqual(fetched_list, REVOCATION_LIST)
-
class DiabloAuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest):
"""Auth Token middleware should understand Diablo keystone responses."""
@@ -735,13 +706,6 @@ class DiabloAuthTokenMiddlewareTest(Base
super(DiabloAuthTokenMiddlewareTest, self).setUp(
expected_env=expected_env)
- def test_valid_diablo_response(self):
- req = webob.Request.blank('/')
- req.headers['X-Auth-Token'] = VALID_DIABLO_TOKEN
- self.middleware(req.environ, self.start_fake_response)
- self.assertEqual(self.response_status, 200)
- self.assertTrue('keystone.token_info' in req.environ)
-
class AuthTokenMiddlewareTest(test.NoModule, BaseAuthTokenMiddlewareTest):
@@ -769,20 +733,6 @@ class AuthTokenMiddlewareTest(test.NoMod
self.assertEqual(body, ['SUCCESS'])
self.assertTrue('keystone.token_info' in req.environ)
- def test_valid_uuid_request(self):
- self.assert_valid_request_200(self.token_dict['uuid_token_default'])
- self.assert_valid_last_url(self.token_dict['uuid_token_default'])
-
- def test_valid_signed_request(self):
- self.middleware.http_client_class.last_requested_url = ''
- self.assert_valid_request_200(
- self.token_dict['signed_token_scoped'])
- self.assertEqual(self.middleware.conf['auth_admin_prefix'],
- "/testadmin")
- #ensure that signed requests do not generate HTTP traffic
- self.assertEqual(
- '', self.middleware.http_client_class.last_requested_url)
-
def test_revoked_token_receives_401(self):
self.middleware.token_revocation_list = self.get_revocation_list_json()
req = webob.Request.blank('/')
@@ -848,15 +798,6 @@ class AuthTokenMiddlewareTest(test.NoMod
self.assertEqual(self.middleware.token_revocation_list_fetched_time,
expected)
- def test_get_revocation_list_returns_fetched_list(self):
- # auth_token uses v2 to fetch this, so don't allow the v3
- # tests to override the fake http connection
- self.set_fake_http(FakeHTTPConnection)
- self.middleware.token_revocation_list_fetched_time = None
- os.remove(self.middleware.revoked_file_name)
- self.assertEqual(self.middleware.token_revocation_list,
- REVOCATION_LIST)
-
def test_get_revocation_list_returns_current_list_from_memory(self):
self.assertEqual(self.middleware.token_revocation_list,
self.middleware._token_revocation_list)
@@ -866,18 +807,6 @@ class AuthTokenMiddlewareTest(test.NoMod
self.middleware._token_revocation_list = None
self.assertEqual(self.middleware.token_revocation_list, in_memory_list)
- def test_invalid_revocation_list_raises_service_error(self):
- globals()['SIGNED_REVOCATION_LIST'] = "{}"
- self.assertRaises(auth_token.ServiceError,
- self.middleware.fetch_revocation_list)
-
- def test_fetch_revocation_list(self):
- # auth_token uses v2 to fetch this, so don't allow the v3
- # tests to override the fake http connection
- self.set_fake_http(FakeHTTPConnection)
- fetched_list = jsonutils.loads(self.middleware.fetch_revocation_list())
- self.assertEqual(fetched_list, REVOCATION_LIST)
-
def test_request_invalid_uuid_token(self):
req = webob.Request.blank('/')
req.headers['X-Auth-Token'] = 'invalid-token'
@@ -1143,9 +1072,6 @@ class v2AuthTokenMiddlewareTest(test.NoM
self.assertEqual(body, ['SUCCESS'])
self.assertTrue('keystone.token_info' in req.environ)
- def test_default_tenant_uuid_token(self):
- self.assert_unscoped_default_tenant_auto_scopes(UUID_TOKEN_DEFAULT)
-
def test_default_tenant_signed_token(self):
self.assert_unscoped_default_tenant_auto_scopes(SIGNED_TOKEN_SCOPED)
@@ -1164,42 +1090,6 @@ class v2AuthTokenMiddlewareTest(test.NoM
def test_unscoped_pki_token_receives_401(self):
self.assert_unscoped_token_receives_401(SIGNED_TOKEN_UNSCOPED)
- def test_request_prevent_service_catalog_injection(self):
- req = webob.Request.blank('/')
- req.headers['X-Service-Catalog'] = '[]'
- req.headers['X-Auth-Token'] = UUID_TOKEN_NO_SERVICE_CATALOG
- body = self.middleware(req.environ, self.start_fake_response)
- self.assertEqual(self.response_status, 200)
- self.assertFalse(req.headers.get('X-Service-Catalog'))
- self.assertEqual(body, ['SUCCESS'])
-
- def test_valid_uuid_request_forced_to_2_0(self):
- """ Test forcing auth_token to use lower api version.
-
- By installing the v3 http hander, auth_token will be get
- a version list that looks like a v3 server - from which it
- would normally chose v3.0 as the auth version. However, here
- we specify v2.0 in the configuration - which should force
- auth_token to use that version instead.
-
- """
- conf = {
- 'auth_host': 'keystone.example.com',
- 'auth_port': 1234,
- 'auth_admin_prefix': '/testadmin',
- 'signing_dir': CERTDIR,
- 'auth_version': 'v2.0'
- }
- self.set_middleware(fake_http=v3FakeHTTPConnection, conf=conf)
- # This tests will only work is auth_token has chosen to use the
- # lower, v2, api version
- req = webob.Request.blank('/')
- req.headers['X-Auth-Token'] = UUID_TOKEN_DEFAULT
- body = self.middleware(req.environ, self.start_fake_response)
- self.assertEqual(self.response_status, 200)
- self.assertEqual("/testadmin/v2.0/tokens/%s" % UUID_TOKEN_DEFAULT,
- v3FakeHTTPConnection.last_requested_url)
-
def test_invalid_auth_version_request(self):
conf = {
'auth_host': 'keystone.example.com',
@@ -1254,9 +1144,6 @@ class v3AuthTokenMiddlewareTest(AuthToke
# this assert test in the base class
self.assertEqual('/testadmin/v3/auth/tokens',
v3FakeHTTPConnection.last_requested_url)
-
- def test_valid_unscoped_uuid_request(self):
- # Remove items that won't be in an unscoped token
delta_expected_env = {
'HTTP_X_PROJECT_ID': None,
'HTTP_X_PROJECT_NAME': None,
@@ -1274,24 +1161,6 @@ class v3AuthTokenMiddlewareTest(AuthToke
self.assertEqual('/testadmin/v3/auth/tokens',
v3FakeHTTPConnection.last_requested_url)
- def test_domain_scoped_uuid_request(self):
- # Modify items compared to default token for a domain scope
- delta_expected_env = {
- 'HTTP_X_DOMAIN_ID': 'domain_id1',
- 'HTTP_X_DOMAIN_NAME': 'domain_name1',
- 'HTTP_X_PROJECT_ID': None,
- 'HTTP_X_PROJECT_NAME': None,
- 'HTTP_X_PROJECT_DOMAIN_ID': None,
- 'HTTP_X_PROJECT_DOMAIN_NAME': None,
- 'HTTP_X_TENANT_ID': None,
- 'HTTP_X_TENANT_NAME': None,
- 'HTTP_X_TENANT': None
- }
- self.set_middleware(expected_env=delta_expected_env)
- self.assert_valid_request_200(v3_UUID_TOKEN_DOMAIN_SCOPED)
- self.assertEqual('/testadmin/v3/auth/tokens',
- v3FakeHTTPConnection.last_requested_url)
-
class TokenEncodingTest(testtools.TestCase):
def test_unquoted_token(self):
