[Nix] adjust pytest retrys (#4558)

aws · May 29, 2024 · 622bcd3 · 622bcd3
1 parent 6f7058f
commit 622bcd3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -582,7 +582,7 @@ if (BUILD_TESTING)
                 add_test(NAME ${test_target}
                         COMMAND
                         pytest
-                        -x -n=${N} --maxfail=1 --reruns=0 --cache-clear -rpfsq
+                        -x -n=${N} --reruns=2 --durations=10 --cache-clear -rpfsq
                         -o log_cli=true --log-cli-level=DEBUG --provider-version=$ENV{S2N_LIBCRYPTO}
                         --provider-criterion=off --fips-mode=0 --no-pq=0 ${test_file_path}
                         WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tests/integrationv2

diff --git a/tests/integrationv2/test_happy_path.py b/tests/integrationv2/test_happy_path.py
@@ -1,4 +1,5 @@
 import copy
+import platform
 import pytest
 
 from configuration import available_ports, ALL_TEST_CIPHERS, ALL_TEST_CURVES, ALL_TEST_CERTS, PROTOCOLS
@@ -66,6 +67,7 @@ def test_s2n_server_happy_path(managed_process, cipher, provider, curve, protoco
                 cipher.name)) in server_results.stdout
 
 
+@pytest.mark.flaky(reruns=5, reruns_delay=2, condition=platform.machine().startswith("aarch"))
 @pytest.mark.uncollect_if(func=invalid_test_parameters)
 @pytest.mark.parametrize("cipher", ALL_TEST_CIPHERS, ids=get_parameter_name)
 @pytest.mark.parametrize("provider", [S2N, OpenSSL, GnuTLS, SSLv3Provider])

diff --git a/tests/integrationv2/test_record_padding.py b/tests/integrationv2/test_record_padding.py
@@ -1,4 +1,5 @@
 import copy
+import platform
 import pytest
 import re
 
@@ -123,6 +124,7 @@ def test_s2n_server_handles_padded_records(managed_process, cipher, provider, cu
             cipher.name)) in server_results.stdout
 
 
+@pytest.mark.flaky(reruns=5, reruns_delay=2, condition=platform.machine().startswith("aarch"))
 @pytest.mark.uncollect_if(func=invalid_test_parameters)
 @pytest.mark.parametrize("cipher", TLS13_CIPHERS, ids=get_parameter_name)
 @pytest.mark.parametrize("provider", [OpenSSL])

diff --git a/tests/integrationv2/test_renegotiate.py b/tests/integrationv2/test_renegotiate.py
@@ -1,4 +1,5 @@
 import copy
+import platform
 import pytest
 import random
 
@@ -188,13 +189,13 @@ def basic_reneg_test(managed_process, cipher, curve, certificate, protocol, prov
 
     server = managed_process(provider, server_options,
                              send_marker=Msg.send_markers(messages, Provider.ServerMode),
-                             timeout=5
+                             timeout=8
                              )
 
     s2n_client = managed_process(S2N, client_options,
                                  send_marker=Msg.send_markers(messages, Provider.ClientMode),
                                  close_marker=Msg.close_marker(messages),
-                                 timeout=5
+                                 timeout=8
                                  )
 
     return (s2n_client, server)
@@ -292,6 +293,7 @@ def test_s2n_client_renegotiate_with_openssl(managed_process, cipher, curve, cer
 """
 
 
+@pytest.mark.flaky(reruns=3, reruns_delay=1, condition=platform.machine().startswith("aarch"))
 @pytest.mark.uncollect_if(func=invalid_test_parameters)
 @pytest.mark.parametrize("cipher", ALL_TEST_CIPHERS, ids=get_parameter_name)
 @pytest.mark.parametrize("curve", ALL_TEST_CURVES, ids=get_parameter_name)
@@ -341,6 +343,7 @@ def test_s2n_client_renegotiate_with_client_auth_with_openssl(managed_process, c
 """
 
 
+@pytest.mark.flaky(reruns=3, reruns_delay=1, condition=platform.machine().startswith("aarch"))
 @pytest.mark.uncollect_if(func=invalid_test_parameters)
 @pytest.mark.parametrize("cipher", ALL_TEST_CIPHERS, ids=get_parameter_name)
 @pytest.mark.parametrize("curve", ALL_TEST_CURVES, ids=get_parameter_name)

diff --git a/tests/integrationv2/test_session_resumption.py b/tests/integrationv2/test_session_resumption.py
@@ -1,5 +1,6 @@
 import copy
 import os
+import platform
 import pytest
 
 from configuration import available_ports, ALL_TEST_CIPHERS, ALL_TEST_CURVES, ALL_TEST_CERTS, PROTOCOLS, TLS13_CIPHERS
@@ -243,6 +244,7 @@ def test_tls13_session_resumption_s2n_client(managed_process, cipher, curve, cer
                 b'SSL_accept:SSLv3/TLS write certificate') == num_full_connections
 
 
+@pytest.mark.flaky(reruns=7, reruns_delay=2, condition=platform.machine().startswith("aarch"))
 @pytest.mark.uncollect_if(func=invalid_test_parameters)
 @pytest.mark.parametrize("cipher", TLS13_CIPHERS, ids=get_parameter_name)
 @pytest.mark.parametrize("curve", ALL_TEST_CURVES, ids=get_parameter_name)