PR feedback

aws · dougch · Jul 11, 2025 · May 20, 2025 · May 20, 2025 · May 21, 2025
commit d63e8a7ff026088dabd6b5536381ce8bcabae0e8
@@ -18,7 +18,8 @@ env:
     # Excluded from nix:
     # - dynamic_record_sizes (fails on aarch64)
 
-    # Run with uv/pytest and not ctest
+    # Run with uv/pytest and not ctest.
+    # We're still seeing failures/flakiness with 7 tests.
     INTEG_UV_TESTS:
       sslyze
 
@@ -167,7 +168,7 @@ phases:
     commands:
       - |
         if [[ ! $CODEBUILD_BATCH_BUILD_IDENTIFIER =~ .*"nixCache".* ]]; then
-          nix develop $NIXDEV_ARGS $NIXDEV_LIBCRYPTO --command bash -c "source ./nix/shell.sh;integ $INTEG_UV_TESTS"
+          nix develop $NIXDEV_ARGS $NIXDEV_LIBCRYPTO --command bash -c "source ./nix/shell.sh;integ $INTEGV2_TESTS"
           nix develop $NIXDEV_ARGS $NIXDEV_LIBCRYPTO --command bash -c "source ./nix/shell.sh;uvinteg $INTEG_UV_TESTS"
         fi
 

diff --git a/flake.lock b/flake.lock
diff --git a/nix/shell.sh b/nix/shell.sh
@@ -4,8 +4,12 @@ export PATH=$SRC_ROOT/build/bin:$PATH
 
 # Function to display a formatted banner with the provided text
 banner()
-{
-    printf " %-55s \n" "$1"
+{   if [ -z "$2" ]; then
+        local WRAPPER="+---------------------------------------------------------+\n"
+    else
+        local WRAPPER=""
+    fi
+    printf "$WRAPPER %-55s \n$WRAPPER" "$1"
 }
 
 # Function to create aliases for different libcrypto implementations
@@ -19,10 +23,10 @@ function libcrypto_alias {
 
     if [[ -f $libcrypto_binary_path ]]; then
       alias $libcrypto_name=$libcrypto_binary_path
-      banner "Libcrypto binary $libcrypto_binary_path available as $libcrypto_name"
+      banner "Libcrypto binary $libcrypto_binary_path available as $libcrypto_name" quiet
     elif [[ -f $lib_binary_path ]]; then
       alias $libcrypto_name=$lib_binary_path
-      banner "Libcrypto binary $lib_binary_path available as $libcrypto_name"
+      banner "Libcrypto binary $lib_binary_path available as $libcrypto_name" quiet
     else
       banner "Could not find libcrypto binary for $libcrypto_name"
     fi
@@ -37,12 +41,12 @@ libcrypto_alias libressl "${LIBRESSL_INSTALL_DIR}/bin/openssl"
 # No need to alias gnutls because it is included in common_packages (see flake.nix).
 
 function clean {(set -e
-    banner "Cleanup ./build"
+    banner "Cleanup ./build" quiet
     rm -rf ./build ./s2n_head
 )}
 
 function configure {(set -e
-    banner "Configuring with cmake"
+    banner "Configuring with cmake" quiet
     cmake -S . -B./build \
           -DBUILD_TESTING=ON \
           -DS2N_INTEG_TESTS=ON \
@@ -71,8 +75,8 @@ function unit {(set -e
         ctest --test-dir build -L unit -j $(nproc) --verbose
     else
         tests=$(ctest --test-dir build -N -L unit | grep -E "Test +#" | grep -Eo "[^ ]+_test$" | grep "$1")
-        banner "Tests:"
-        banner "$tests"
+        banner "Tests:" quiet
+        banner "$tests" quiet
         # Split the tests string into words
         for test in $tests
         do
@@ -104,10 +108,9 @@ function uvinteg {(
     cd ./tests/integrationv2
     banner "Warning: unsetting PYTHONPATH; you may need to exit this devshell to reset the python environment."
     unset PYTHONPATH
-    # tests reliably fail on large instances with more than 50 workers.
-    local PYTEST_ARGS="--provider-version $S2N_LIBCRYPTO -x -n auto --maxprocesses=50 --reruns=2 --durations=10  -rpfs --cache-clear"
+    local PYTEST_ARGS="--provider-version $S2N_LIBCRYPTO -x -n auto --reruns=2 --durations=10 -rpfs --cache-clear"
     if [[ -z "$1" ]]; then
-        banner "Running all integ tests with uv"
+        banner "Running all integ tests with uv" quiet
         uv run pytest $PYTEST_ARGS --junitxml=../../build/junit/uv_integ.xml
     else
         for test in "$@"; do