diff options
| author | Steve Martinelli <s.martinelli@gmail.com> | 2016-09-05 10:15:57 -0700 |
|---|---|---|
| committer | Steve Martinelli <s.martinelli@gmail.com> | 2016-09-05 17:23:42 +0000 |
| commit | 24c8b94baf4c95cd3a76159009badbc53573be09 (patch) | |
| tree | 48624db47624ab993b7cd7a270d8f39b2ef43640 /openstackclient/tests/identity/v2_0 | |
| parent | 3b75c9aae55356e8f7b2c04e0101ede99d860c1a (diff) | |
| download | python-openstackclient-24c8b94baf4c95cd3a76159009badbc53573be09.tar.gz | |
format token expires time to prevent json loading datetime data
When output to shell, the token issue time is fine; however when
selecting the json formatter (via the --format json) option, an
exception is raised when formatting the dataetime data.
Rather than pass in the datetime data, we should format the data
with the ISO 8601 formatting.
Closes-Bug: 1619937
Change-Id: Iffebb2d5413fabfd283dfa94fc560fc37270f9dd
Diffstat (limited to 'openstackclient/tests/identity/v2_0')
| -rw-r--r-- | openstackclient/tests/identity/v2_0/fakes.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/identity/v2_0/test_token.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/openstackclient/tests/identity/v2_0/fakes.py b/openstackclient/tests/identity/v2_0/fakes.py index a715427c..3e0b9993 100644 --- a/openstackclient/tests/identity/v2_0/fakes.py +++ b/openstackclient/tests/identity/v2_0/fakes.py @@ -80,7 +80,7 @@ USER = { 'enabled': True, } -token_expires = '2014-01-01T00:00:00Z' +token_expires = '2016-09-05T18:04:52+0000' token_id = 'token-id-' + uuid.uuid4().hex TOKEN = { diff --git a/openstackclient/tests/identity/v2_0/test_token.py b/openstackclient/tests/identity/v2_0/test_token.py index bb776707..17115e6b 100644 --- a/openstackclient/tests/identity/v2_0/test_token.py +++ b/openstackclient/tests/identity/v2_0/test_token.py @@ -58,7 +58,7 @@ class TestTokenIssue(TestToken): collist = ('expires', 'id', 'project_id', 'user_id') self.assertEqual(collist, columns) datalist = ( - auth_ref.expires, + identity_fakes.token_expires, identity_fakes.token_id, 'project-id', 'user-id', @@ -86,7 +86,7 @@ class TestTokenIssue(TestToken): ) self.assertEqual(collist, columns) datalist = ( - auth_ref.expires, + identity_fakes.token_expires, identity_fakes.token_id, 'user-id', ) |