From c4be7c428cbf6ab06bb5f80f205739635839ca67 Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Mon, 26 Aug 2019 15:35:56 -0700 Subject: [PATCH] try passing workspace through instead --- certbot-ci/certbot_integration_tests/utils/certbot_call.py | 2 +- certbot-ci/certbot_integration_tests/utils/misc.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/certbot-ci/certbot_integration_tests/utils/certbot_call.py b/certbot-ci/certbot_integration_tests/utils/certbot_call.py index 1bff94e75..e1a5695c7 100755 --- a/certbot-ci/certbot_integration_tests/utils/certbot_call.py +++ b/certbot-ci/certbot_integration_tests/utils/certbot_call.py @@ -39,7 +39,7 @@ def _prepare_args_env(certbot_args, directory_url, http_01_port, tls_alpn_01_por new_environ['TMPDIR'] = workspace additional_args = [] - if misc.get_certbot_version() >= LooseVersion('0.30.0'): + if misc.get_certbot_version(workspace) >= LooseVersion('0.30.0'): additional_args.append('--no-random-sleep-on-renew') if force_renew: diff --git a/certbot-ci/certbot_integration_tests/utils/misc.py b/certbot-ci/certbot_integration_tests/utils/misc.py index fad978408..bad708a62 100644 --- a/certbot-ci/certbot_integration_tests/utils/misc.py +++ b/certbot-ci/certbot_integration_tests/utils/misc.py @@ -209,14 +209,11 @@ shutil.rmtree(well_known) shutil.rmtree(tempdir) -def get_certbot_version(): +def get_certbot_version(workspace): """ Find the version of the certbot available in PATH. :return str: the certbot version """ - workspace = os.environ.get('WORKSPACE', os.path.join(os.getcwd(), '.certbot_test_workspace')) - if not os.path.exists(workspace): - os.mkdir(workspace) output = subprocess.check_output(['certbot', '--version'], universal_newlines=True, stderr=subprocess.STDOUT, cwd=workspace)