fix CI on python 2.7

This commit is contained in:
Richard van der Hoff 2019-06-10 17:41:10 +01:00
parent 8d0bd9bb60
commit 19780a521e

View File

@ -70,7 +70,7 @@ def create_test_cert_file(sanlist):
cert_file_count += 1 cert_file_count += 1
# first build a CSR # first build a CSR
subprocess.run( subprocess.check_call(
[ [
"openssl", "openssl",
"req", "req",
@ -81,8 +81,7 @@ def create_test_cert_file(sanlist):
"/", "/",
"-out", "-out",
csr_filename, csr_filename,
], ]
check=True,
) )
# now a config file describing the right SAN entries # now a config file describing the right SAN entries
@ -93,7 +92,7 @@ def create_test_cert_file(sanlist):
# finally the cert # finally the cert
ca_key_filename = os.path.join(os.path.dirname(__file__), "ca.key") ca_key_filename = os.path.join(os.path.dirname(__file__), "ca.key")
ca_cert_filename = get_test_ca_cert_file() ca_cert_filename = get_test_ca_cert_file()
subprocess.run( subprocess.check_call(
[ [
"openssl", "openssl",
"x509", "x509",
@ -110,8 +109,7 @@ def create_test_cert_file(sanlist):
cnf_filename, cnf_filename,
"-out", "-out",
cert_filename, cert_filename,
], ]
check=True,
) )
return cert_filename return cert_filename