openstack/tempest
Code Issues Proposed changes

Merge "Py3: don't access the unicode type directly."

Browse Source
This commit is contained in:
Jenkins 2016-06-24 17:30:26 +00:00 committed by Gerrit Code Review
commit 0a70535150
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tempest/api/identity/admin/v3/test_tokens.py
View File

@ -13,6 +13,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import six
from tempest.api.identity import base from tempest.api.identity import base
from tempest.common.utils import data_utils from tempest.common.utils import data_utils
from tempest.lib import exceptions as lib_exc from tempest.lib import exceptions as lib_exc
@ -97,8 +99,8 @@ class TokensV3TestJSON(base.BaseIdentityV3AdminTest):
orig_expires_at = token_auth['token']['expires_at'] orig_expires_at = token_auth['token']['expires_at']
orig_user = token_auth['token']['user'] orig_user = token_auth['token']['user']
self.assertIsInstance(token_auth['token']['expires_at'], unicode) self.assertIsInstance(token_auth['token']['expires_at'], six.text_type)
self.assertIsInstance(token_auth['token']['issued_at'], unicode) self.assertIsInstance(token_auth['token']['issued_at'], six.text_type)
self.assertEqual(['password'], token_auth['token']['methods']) self.assertEqual(['password'], token_auth['token']['methods'])
self.assertEqual(user['id'], token_auth['token']['user']['id']) self.assertEqual(user['id'], token_auth['token']['user']['id'])
self.assertEqual(user['name'], token_auth['token']['user']['name']) self.assertEqual(user['name'], token_auth['token']['user']['name'])
@ -118,7 +120,7 @@ class TokensV3TestJSON(base.BaseIdentityV3AdminTest):
self.assertEqual(orig_expires_at, token_auth['token']['expires_at'], self.assertEqual(orig_expires_at, token_auth['token']['expires_at'],
'Expiration time should match original token') 'Expiration time should match original token')
self.assertIsInstance(token_auth['token']['issued_at'], unicode) self.assertIsInstance(token_auth['token']['issued_at'], six.text_type)
self.assertEqual(set(['password', 'token']), self.assertEqual(set(['password', 'token']),
set(token_auth['token']['methods'])) set(token_auth['token']['methods']))
self.assertEqual(orig_user, token_auth['token']['user'], self.assertEqual(orig_user, token_auth['token']['user'],