Merge "Enable py3 testing for Fernet token provider"

changes/11/292611/17
Jenkins 6 years ago committed by Gerrit Code Review
commit 6635f8dcac
  1. 2
      keystone/tests/unit/token/test_fernet_provider.py
  2. 5
      keystone/token/providers/fernet/token_formatters.py
  3. 1
      tests-py3-blacklist.txt

@ -149,7 +149,7 @@ class TestValidate(unit.TestCase):
'protocol': {'id': protocol, },
},
}
self.assertEqual(exp_user_info, token['user'])
self.assertDictEqual(exp_user_info, token['user'])
def test_validate_v3_token_trust(self):
# Check the trust fields in the token result when use validate_v3_token

@ -20,6 +20,7 @@ import msgpack
from oslo_config import cfg
from oslo_log import log
from oslo_utils import timeutils
import six
from six.moves import map
from six.moves import urllib
@ -536,7 +537,9 @@ class FederatedUnscopedPayload(BasePayload):
idp_id = cls.convert_uuid_bytes_to_hex(idp_id)
else:
idp_id = idp_id.decode('utf-8')
protocol_id = payload[4].decode('utf-8')
protocol_id = payload[4]
if isinstance(protocol_id, six.binary_type):
protocol_id = protocol_id.decode('utf-8')
expires_at_str = cls._convert_float_to_time_string(payload[5])
audit_ids = list(map(provider.base64_encode, payload[6]))
federated_info = dict(group_ids=group_ids, idp_id=idp_id,

@ -1,3 +1,2 @@
keystone.tests.unit.test_v3_auth
keystone.tests.unit.test_v3_oauth1
keystone.tests.unit.token.test_fernet_provider

Loading…
Cancel
Save