Fixes to get cert tests running in Py3
bp python3 Change-Id: I7a8fa9fcfa22ac97def54b601c0a95f12181c18e
This commit is contained in:
parent
72e8f55946
commit
a89cec4f88
|
@ -68,7 +68,7 @@ class BaseCertificateConfigure(object):
|
|||
openssl_ver = environment.subprocess.check_output( # the arguments
|
||||
# are hardcoded and just check the openssl version
|
||||
['openssl', 'version'])
|
||||
if "OpenSSL 0." in openssl_ver:
|
||||
if b'OpenSSL 0.' in openssl_ver:
|
||||
self.ssl_dictionary['default_md'] = 'sha1'
|
||||
except environment.subprocess.CalledProcessError:
|
||||
LOG.warning(_LW('Failed to invoke ``openssl version``, '
|
||||
|
|
|
@ -34,7 +34,7 @@ class TestSimpleCert(BaseTestCase):
|
|||
expected_status=http_client.OK)
|
||||
|
||||
self.assertEqual(content_type, response.content_type.lower())
|
||||
self.assertIn('---BEGIN', response.body)
|
||||
self.assertIn(b'---BEGIN', response.body)
|
||||
|
||||
return response
|
||||
|
||||
|
|
|
@ -3,8 +3,6 @@ keystone.tests.unit.common.test_notifications
|
|||
keystone.tests.unit.test_associate_project_endpoint_extension
|
||||
keystone.tests.unit.test_backend_ldap
|
||||
keystone.tests.unit.test_backend_ldap_pool
|
||||
keystone.tests.unit.test_cert_setup
|
||||
keystone.tests.unit.test_contrib_simple_cert
|
||||
keystone.tests.unit.test_hacking_checks
|
||||
keystone.tests.unit.test_ipv6
|
||||
keystone.tests.unit.test_v2
|
||||
|
|
Loading…
Reference in New Issue