Skip to content

Commit 425247d

Browse files
authored
tests(integv2): fix flaky session resumption test (#5362)
1 parent 8967289 commit 425247d

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

tests/integrationv2/test_session_resumption.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# SPDX-License-Identifier: Apache-2.0
33
import copy
44
import os
5-
import platform
65
import pytest
76

87
from configuration import (
@@ -321,9 +320,6 @@ def test_tls13_session_resumption_s2n_client(
321320
)
322321

323322

324-
@pytest.mark.flaky(
325-
reruns=7, reruns_delay=2, condition=platform.machine().startswith("aarch")
326-
)
327323
@pytest.mark.uncollect_if(func=invalid_test_parameters)
328324
@pytest.mark.parametrize("cipher", TLS13_CIPHERS, ids=get_parameter_name)
329325
@pytest.mark.parametrize("curve", ALL_TEST_CURVES, ids=get_parameter_name)
@@ -371,8 +367,14 @@ def test_s2nd_falls_back_to_full_connection(
371367
server_options.cert = certificate.cert
372368
server_options.extra_flags = None
373369

374-
server = managed_process(provider, server_options, timeout=5)
375-
client = managed_process(provider, client_options, timeout=5)
370+
server = managed_process(provider, server_options)
371+
372+
# The send_marker prevents us from closing stdin until the client receives
373+
# the session ticket. If we close stdin too early, then the client will exit
374+
# the echo loop and stop listening for new messages.
375+
client = managed_process(
376+
provider, client_options, send_marker="TLS read server session ticket"
377+
)
376378

377379
# The client should have received a session ticket
378380
for results in client.get_results():

0 commit comments

Comments
 (0)