Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Ocsp timeout adjustment #4866

Merged
merged 4 commits into from
Nov 21, 2024
Merged

chore: Ocsp timeout adjustment #4866

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ae251a
ci: mark ocsp flaky and reduce the wait time for hangs
dougch Oct 31, 2024
888f133
Merge branch 'main' into ocsp_timeout
dougch Nov 13, 2024
cd66e9f
PR feedback
dougch Nov 21, 2024
2fef673
Merge branch 'main' into ocsp_timeout
dougch Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions tests/integrationv2/test_ocsp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
dougch marked this conversation as resolved.
Show resolved Hide resolved
@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)
Expand Down Expand Up @@ -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)
Comment on lines -122 to +124
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm the original PR had 2000, but no explanation for it and none of the reviewers questioned it. @goatgoose any chance you remember the reasoning from almost 3 years ago? :P

Copy link
Contributor

@goatgoose goatgoose Nov 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not remember sadly. I'm guessing it was a mistake though. 2,000 seems way too high to be intentional. Maybe leftover from debugging or something.


for client_results in client.get_results():
client_results.assert_success()
Expand Down
Loading