From 5ae251ab8a779ecb21ee34936bcaf4629f194328 Mon Sep 17 00:00:00 2001 From: Doug Chapman <54039637+dougch@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:02:09 -0700 Subject: [PATCH 1/2] ci: mark ocsp flaky and reduce the wait time for hangs --- tests/integrationv2/test_ocsp.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/integrationv2/test_ocsp.py b/tests/integrationv2/test_ocsp.py index f99edab9937..e0ac1f2ed14 100644 --- a/tests/integrationv2/test_ocsp.py +++ b/tests/integrationv2/test_ocsp.py @@ -76,6 +76,7 @@ def test_s2n_client_ocsp_response(managed_process, cipher, provider, other_provi assert random_bytes[1:] in server_results.stdout or random_bytes[1:] in server_results.stderr +@pytest.mark.flaky(reruns=3, reruns_delay=1) @pytest.mark.uncollect_if(func=invalid_test_parameters) @pytest.mark.parametrize("cipher", ALL_TEST_CIPHERS, ids=get_parameter_name) @pytest.mark.parametrize("provider", [GnuTLS, OpenSSL], ids=get_parameter_name) @@ -119,9 +120,9 @@ def test_s2n_server_ocsp_response(managed_process, cipher, provider, other_provi # it immediately after sending the message. kill_marker = b"Sent: " - server = managed_process(S2N, server_options, timeout=2000) + server = managed_process(S2N, server_options, timeout=90) client = managed_process(provider, client_options, - timeout=2000, kill_marker=kill_marker) + timeout=90, kill_marker=kill_marker) for client_results in client.get_results(): client_results.assert_success() From cd66e9f9da657f5bf8619b0f9159299f341cab4b Mon Sep 17 00:00:00 2001 From: Doug Chapman <54039637+dougch@users.noreply.github.com> Date: Thu, 21 Nov 2024 12:07:42 -0800 Subject: [PATCH 2/2] PR feedback --- tests/integrationv2/test_ocsp.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/integrationv2/test_ocsp.py b/tests/integrationv2/test_ocsp.py index e0ac1f2ed14..71af0e59d15 100644 --- a/tests/integrationv2/test_ocsp.py +++ b/tests/integrationv2/test_ocsp.py @@ -76,7 +76,6 @@ def test_s2n_client_ocsp_response(managed_process, cipher, provider, other_provi assert random_bytes[1:] in server_results.stdout or random_bytes[1:] in server_results.stderr -@pytest.mark.flaky(reruns=3, reruns_delay=1) @pytest.mark.uncollect_if(func=invalid_test_parameters) @pytest.mark.parametrize("cipher", ALL_TEST_CIPHERS, ids=get_parameter_name) @pytest.mark.parametrize("provider", [GnuTLS, OpenSSL], ids=get_parameter_name)