From 8892f232679b0188db6b439a65585285e5f8bc51 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Fri, 31 Jan 2020 20:38:28 +0100 Subject: [PATCH] Use regex to validate certbot --version output --- certbot-ci/windows_installer_integration_tests/test_main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/certbot-ci/windows_installer_integration_tests/test_main.py b/certbot-ci/windows_installer_integration_tests/test_main.py index 0936b8d64..f86fdbb23 100644 --- a/certbot-ci/windows_installer_integration_tests/test_main.py +++ b/certbot-ci/windows_installer_integration_tests/test_main.py @@ -2,6 +2,7 @@ import os import time import unittest import subprocess +import re @unittest.skipIf(os.name != 'nt', reason='Windows installer tests must be run on Windows.') @@ -19,7 +20,7 @@ def test_it(request): # Assert certbot is installed and runnable output = subprocess.check_output(['certbot', '--version'], universal_newlines=True) - assert 'certbot 1.' in output, 'Flag --version does not output a version.' + assert re.match(r'^certbot \d+\.\d+\.\d+.*$', output), 'Flag --version does not output a version.' # Assert renew task is installed and ready output = _ps('(Get-ScheduledTask -TaskName "Certbot Renew Task").State', capture_stdout=True)