run-tests.sh hacking for compatibility

Author: NoahStapp

.evergreen/run-tests.sh

@@ -268,20 +268,32 @@ if [ -z "$GREEN_FRAMEWORK" ]; then
     PYTEST_ARGS="-v --capture=tee-sys --durations=5 $TEST_ARGS"
     if [ -n "$TEST_SUITES" ]; then
       # Workaround until unittest -> pytest conversion is complete
+      if [[ "$TEST_SUITES" == *"default_async"* ]]; then
+        # shellcheck disable=SC2206
+        ASYNC_PYTEST_ARGS=("-m asyncio" "--junitxml=xunit-results/TEST-asyncresults.xml" $PYTEST_ARGS)
+      else
+        # shellcheck disable=SC2206
+        ASYNC_PYTEST_ARGS=("-m asyncio and $TEST_SUITES" "--junitxml=xunit-results/TEST-asyncresults.xml" $PYTEST_ARGS)
+      fi
       # shellcheck disable=SC2206
-      ASYNC_PYTEST_ARGS=("-m asyncio and $TEST_SUITES" "--junitxml=xunit-results/TEST-asyncresults.xml" $PYTEST_ARGS)
-      PYTEST_ARGS="-m $TEST_SUITES $PYTEST_ARGS"
+      PYTEST_ARGS=("-m $TEST_SUITES and not asyncio" $PYTEST_ARGS)
     fi
     # shellcheck disable=SC2048
-    uv run ${UV_ARGS[*]} pytest $PYTEST_ARGS
+    uv run ${UV_ARGS[*]} pytest "${PYTEST_ARGS[@]}"
 
     # Workaround until unittest -> pytest conversion is complete
-    if [ -z "$TEST_SUITES" ]; then
-      # shellcheck disable=SC2206
-      ASYNC_PYTEST_ARGS=("-m asyncio" "--junitxml=xunit-results/TEST-asyncresults.xml" $PYTEST_ARGS)
+    if [ -n "$TEST_SUITES" ]; then
+      set +o errexit
+      # shellcheck disable=SC2048
+      uv run ${UV_ARGS[*]} pytest "${ASYNC_PYTEST_ARGS[@]}" "--collect-only"
+      collected=$?
+      set -o errexit
+      # If we collected at least one async test, run all collected tests
+      if [ $collected -ne 5 ]; then
+        # shellcheck disable=SC2048
+        uv run ${UV_ARGS[*]} pytest "${ASYNC_PYTEST_ARGS[@]}"
+      fi
     fi
-    # shellcheck disable=SC2048
-    uv run ${UV_ARGS[*]} pytest "${ASYNC_PYTEST_ARGS[@]}"
 else
     # shellcheck disable=SC2048
     uv run ${UV_ARGS[*]} green_framework_test.py $GREEN_FRAMEWORK -v $TEST_ARGS