diff options
| author | Chmouel Boudjnah <chmouel@enovance.com> | 2013-03-12 15:54:51 +0000 |
|---|---|---|
| committer | Chmouel Boudjnah <chmouel@enovance.com> | 2013-04-03 11:45:44 +0200 |
| commit | 3ce7017c7aba358158296f992ed4b594f0958834 (patch) | |
| tree | 23e9915e3a615d0a1c0e2e0af1ddef34a848280d /tests | |
| parent | 3a3e2540ff10a78ca9b4dde98671f6fd970e6568 (diff) | |
| download | python-keystoneclient-3ce7017c7aba358158296f992ed4b594f0958834.tar.gz | |
Fix v3 with UUID and memcache expiring.
- Regenerate tokens to change expires in expires_at.
Change-Id: Iaa62dca50d34a228e4850b59d263b807c5ee3549
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_auth_token_middleware.py | 16 | ||||
| -rw-r--r-- | tests/v2_0/test_auth.py | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/test_auth_token_middleware.py b/tests/test_auth_token_middleware.py index f2615d6..86d9ee2 100644 --- a/tests/test_auth_token_middleware.py +++ b/tests/test_auth_token_middleware.py @@ -91,7 +91,7 @@ TOKEN_RESPONSES = { 'access': { 'token': { 'id': UUID_TOKEN_DEFAULT, - 'expires': '2999-01-01T00:00:10Z', + 'expires': '2020-01-01T00:00:10.000123Z', 'tenant': { 'id': 'tenant_id1', 'name': 'tenant_name1', @@ -112,7 +112,7 @@ TOKEN_RESPONSES = { 'access': { 'token': { 'id': VALID_DIABLO_TOKEN, - 'expires': '2999-01-01T00:00:10', + 'expires': '2020-01-01T00:00:10.000123Z', 'tenantId': 'tenant_id1', }, 'user': { @@ -129,7 +129,7 @@ TOKEN_RESPONSES = { 'access': { 'token': { 'id': UUID_TOKEN_UNSCOPED, - 'expires': '2999-01-01T00:00:10Z', + 'expires': '2020-01-01T00:00:10.000123Z', }, 'user': { 'id': 'user_id1', @@ -145,7 +145,7 @@ TOKEN_RESPONSES = { 'access': { 'token': { 'id': 'valid-token', - 'expires': '2999-01-01T00:00:10Z', + 'expires': '2020-01-01T00:00:10.000123Z', 'tenant': { 'id': 'tenant_id1', 'name': 'tenant_name1', @@ -163,7 +163,7 @@ TOKEN_RESPONSES = { }, v3_UUID_TOKEN_DEFAULT: { 'token': { - 'expires': '2999-01-01T00:00:10Z', + 'expires_at': '2020-01-01T00:00:10.000123Z', 'user': { 'id': 'user_id1', 'name': 'user_name1', @@ -189,7 +189,7 @@ TOKEN_RESPONSES = { }, v3_UUID_TOKEN_UNSCOPED: { 'token': { - 'expires': '2999-01-01T00:00:10Z', + 'expires_at': '2020-01-01T00:00:10.000123Z', 'user': { 'id': 'user_id1', 'name': 'user_name1', @@ -202,7 +202,7 @@ TOKEN_RESPONSES = { }, v3_UUID_TOKEN_DOMAIN_SCOPED: { 'token': { - 'expires': '2999-01-01T00:00:10Z', + 'expires_at': '2020-01-01T00:00:10.000123Z', 'user': { 'id': 'user_id1', 'name': 'user_name1', @@ -304,7 +304,7 @@ def setUpModule(self): self.TOKEN_RESPONSES[self.SIGNED_v3_TOKEN_SCOPED_KEY] = { 'token': { - 'expires': '2999-01-01T00:00:10Z', + 'expires': '2020-01-01T00:00:10.000123Z', 'user': { 'id': 'user_id1', 'name': 'user_name1', diff --git a/tests/v2_0/test_auth.py b/tests/v2_0/test_auth.py index 0c0af99..21fa1ed 100644 --- a/tests/v2_0/test_auth.py +++ b/tests/v2_0/test_auth.py @@ -16,7 +16,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase): self.TEST_RESPONSE_DICT = { "access": { "token": { - "expires": "2999-01-01T00:00:10Z", + "expires": "2020-01-01T00:00:10.000123Z", "id": self.TEST_TOKEN, "tenant": { "id": self.TEST_TENANT_ID @@ -71,7 +71,7 @@ class AuthenticateAgainstKeystoneTests(utils.TestCase): self.mox.ResetAll() TEST_TOKEN = "abcdef" self.TEST_RESPONSE_DICT['access']['token']['expires'] = \ - "2999-01-01T00:00:10Z" + '2020-01-01T00:00:10.000123Z' self.TEST_RESPONSE_DICT['access']['token']['id'] = TEST_TOKEN resp = utils.TestResponse({ |