From 2b78d3c4e23e14fe0c939977404ed87e2d84847c Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 20 Apr 2020 11:31:43 -0700 Subject: [PATCH] try still using .bat --- certbot-ci/certbot_integration_tests/utils/misc.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/certbot-ci/certbot_integration_tests/utils/misc.py b/certbot-ci/certbot_integration_tests/utils/misc.py index e47499383..fbb965034 100644 --- a/certbot-ci/certbot_integration_tests/utils/misc.py +++ b/certbot-ci/certbot_integration_tests/utils/misc.py @@ -140,12 +140,13 @@ def generate_test_file_hooks(config_dir, hook_probe): entrypoint_script = '''\ #!/usr/bin/env bash set -e -"{0}" "{1}" "{2}" >> "{3}" +"{0}" "{1}" "{2}" "{3}" '''.format(sys.executable, hook_path, entrypoint_script_path, hook_probe) else: - entrypoint_script_path = os.path.join(hook_dir, 'entrypoint.ps1') + entrypoint_script_path = os.path.join(hook_dir, 'entrypoint.bat') entrypoint_script = '''\ -& "{0}" "{1}" "{2}" >> "{3}" +@echo off +"{0}" "{1}" "{2}" "{3}" '''.format(sys.executable, hook_path, entrypoint_script_path, hook_probe) with open(entrypoint_script_path, 'w') as file_h: @@ -235,7 +236,7 @@ def generate_csr(domains, key_path, csr_path, key_type=RSA_KEY_TYPE): file_h.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, key)) req = crypto.X509Req() - san = ', '.join(['DNS:{0}'.format(item) for item in domains]) + san = ', '.join('DNS:{0}'.format(item) for item in domains) san_constraint = crypto.X509Extension(b'subjectAltName', False, san.encode('utf-8')) req.add_extensions([san_constraint])