|
2 | 2 | # SPDX-License-Identifier: Apache-2.0 |
3 | 3 | import copy |
4 | 4 | import os |
5 | | -import platform |
6 | 5 | import pytest |
7 | 6 |
|
8 | 7 | from configuration import ( |
@@ -321,9 +320,6 @@ def test_tls13_session_resumption_s2n_client( |
321 | 320 | ) |
322 | 321 |
|
323 | 322 |
|
324 | | -@pytest.mark.flaky( |
325 | | - reruns=7, reruns_delay=2, condition=platform.machine().startswith("aarch") |
326 | | -) |
327 | 323 | @pytest.mark.uncollect_if(func=invalid_test_parameters) |
328 | 324 | @pytest.mark.parametrize("cipher", TLS13_CIPHERS, ids=get_parameter_name) |
329 | 325 | @pytest.mark.parametrize("curve", ALL_TEST_CURVES, ids=get_parameter_name) |
@@ -371,8 +367,14 @@ def test_s2nd_falls_back_to_full_connection( |
371 | 367 | server_options.cert = certificate.cert |
372 | 368 | server_options.extra_flags = None |
373 | 369 |
|
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 | + ) |
376 | 378 |
|
377 | 379 | # The client should have received a session ticket |
378 | 380 | for results in client.get_results(): |
|
0 commit comments