From 67e54e3374ddfa899857078e8774b10763acea27 2025-09-07 00:00:20 From: Branko Majic Date: 2025-09-07 00:00:20 Subject: [PATCH] GC-48: Update the test framework: - Slight change required for handling differences in how the output lines are being broken up during testing. --- diff --git a/functional_tests/test_client.py b/functional_tests/test_client.py index b45514a20a933a0d0bae581edd84ffaf08d16635..ff5b69807d0b6b43bb6bc2968f6b9f8754801a88 100644 --- a/functional_tests/test_client.py +++ b/functional_tests/test_client.py @@ -44,7 +44,7 @@ def test_client_command_available_with_help(): assert exit_code == 0 assert stderr == "" assert stdout.startswith("usage: gimmecert client") - assert stdout.split('\n')[2].endswith(" entity_name") # Third line of help. + assert stdout.split('\n')[0].endswith(" entity_name") # First line of help. def test_client_command_requires_initialised_hierarchy(tmpdir): diff --git a/functional_tests/test_renew.py b/functional_tests/test_renew.py index b6a30ad9dc17746f42c5534aee5fe0bff59a4782..925d22e0a5763f3fc975e1c8580f8eff0cdd59f4 100644 --- a/functional_tests/test_renew.py +++ b/functional_tests/test_renew.py @@ -46,7 +46,7 @@ def test_renew_command_available_with_help(): assert exit_code == 0 assert stderr == "" assert stdout.startswith("usage: gimmecert renew") - assert stdout.split('\n')[3].endswith("{server,client} entity_name") # Fourth line of help (first two are options) + assert stdout.split('\n')[0].endswith("{server,client} entity_name") # First line of help. def test_renew_command_requires_initialised_hierarchy(tmpdir): diff --git a/setup.py b/setup.py index bd855ff09ae82d557c16a2cab1df29bd069817e3..023416bbde5cf8ee6f2e79415cc90aa1966cff4e 100755 --- a/setup.py +++ b/setup.py @@ -36,14 +36,14 @@ doc_requirements = [ ] test_lint_requirements = [ - 'flake8>=7.0,<7.1', + 'flake8>=7.3,<7.4', ] test_requirements = [ - 'time-machine>=2.13,<2.14', - 'pytest>=8.0,<8.1', - 'pytest-cov>=4.1,<4.2', - 'tox>=4.13,<4.14', + 'time-machine>=2.19,<2.20', + 'pytest>=8.4,<8.5', + 'pytest-cov>=6.3,<6.4', + 'tox>=4.30,<4.31', 'pexpect>=4.9,<4.10', ]