diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py index f5181d3f9..399b116a0 100644 --- a/keystoneclient/middleware/auth_token.py +++ b/keystoneclient/middleware/auth_token.py @@ -211,7 +211,7 @@ opts = [ ] CONF.register_opts(opts, group='keystone_authtoken') -LIST_OF_VERSIONS_TO_ATTEMPT = ['v3.0', 'v2.0'] +LIST_OF_VERSIONS_TO_ATTEMPT = ['v2.0', 'v3.0'] def will_expire_soon(expiry): diff --git a/tests/test_auth_token_middleware.py b/tests/test_auth_token_middleware.py index 17bd2aa9a..350a09171 100644 --- a/tests/test_auth_token_middleware.py +++ b/tests/test_auth_token_middleware.py @@ -1338,6 +1338,7 @@ class v3AuthTokenMiddlewareTest(AuthTokenMiddlewareTest): 'revoked_token_hash': REVOKED_v3_TOKEN_HASH } super(v3AuthTokenMiddlewareTest, self).setUp( + auth_version='v3.0', fake_app=v3FakeApp, fake_http=v3FakeHTTPConnection, token_dict=token_dict, @@ -1370,7 +1371,7 @@ class v3AuthTokenMiddlewareTest(AuthTokenMiddlewareTest): v3FakeHTTPConnection.last_requested_url) def test_domain_scoped_uuid_request(self): - # Modify items comapred to default token for a domain scope + # 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',