Fix evg tests

Author: aclark4life

.evergreen/generated_configs/functions.yml

@@ -258,23 +258,8 @@ functions:
       params:
         binary: bash
         args:
-          - .evergreen/just.sh
-          - setup-tests
-          - ${TEST_NAME}
-          - ""
-        working_dir: src
-        include_expansions_in_env:
-          - TOOLCHAIN_VERSION
-          - PYMONGO_BUILD_RUST
-          - PYMONGO_USE_RUST
-          - TEST_ARGS
-      type: test
-    - command: subprocess.exec
-      params:
-        binary: bash
-        args:
-          - .evergreen/just.sh
-          - run-tests
+          - -c
+          - "if [ -f .evergreen/scripts/env.sh ]; then . .evergreen/scripts/env.sh; fi; if [ \"Windows_NT\" = \"${OS:-}\" ]; then CARGO_BIN=\"$USERPROFILE/.cargo/bin\"; else CARGO_BIN=\"$HOME/.cargo/bin\"; fi; if ! command -v cargo &> /dev/null; then echo \"Installing Rust...\"; curl --proto \"=https\" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y; fi; export PATH=\"$CARGO_BIN:$PATH\"; echo \"Rust toolchain: $(rustc --version 2>/dev/null || echo not found)\"; echo \"Cargo: $(cargo --version 2>/dev/null || echo not found)\"; echo \"Cargo path: $(command -v cargo || echo not found)\"; if [ -f .evergreen/scripts/env.sh ]; then echo \"export PATH=\\\"$CARGO_BIN:\\$PATH\\\"\" >> .evergreen/scripts/env.sh; fi; bash .evergreen/just.sh setup-tests \"${TEST_NAME}\" \"\"; bash .evergreen/just.sh run-tests"
         working_dir: src
         include_expansions_in_env:
           - TOOLCHAIN_VERSION

.evergreen/generated_configs/tasks.yml

@@ -5031,23 +5031,23 @@ tasks:
   # Test rust tests
   - name: test-rust-python3.10
     commands:
-      - func: run tests
+      - func: run rust tests
         vars:
           TOOLCHAIN_VERSION: "3.10"
           TEST_NAME: test_bson
           TEST_ARGS: test/test_bson.py -v
     tags: [test-rust, python-3.10]
   - name: test-rust-python3.12
     commands:
-      - func: run tests
+      - func: run rust tests
         vars:
           TOOLCHAIN_VERSION: "3.12"
           TEST_NAME: test_bson
           TEST_ARGS: test/test_bson.py -v
     tags: [test-rust, python-3.12]
   - name: test-rust-python3.14
     commands:
-      - func: run tests
+      - func: run rust tests
         vars:
           TOOLCHAIN_VERSION: "3.14"
           TEST_NAME: test_bson

.evergreen/scripts/generate_config.py

@@ -1273,7 +1273,7 @@ def create_test_rust_tasks():
             tags.append("pr")  # Run on PRs for latest Python
         task_name = get_task_name("test-rust", python=python)
         test_func = FunctionCall(
-            func="run tests",
+            func="run rust tests",
             vars=dict(
                 TOOLCHAIN_VERSION=python,
                 TEST_NAME="test_bson",
@@ -1305,14 +1305,53 @@ def create_test_rust_variants() -> list[BuildVariant]:
 
 
 def create_test_rust_func():
-    """Create function for running Rust extension tests."""
+    """Create function for running Rust extension tests.
+
+    This function installs Rust if needed, then runs the test setup and execution.
+    The Rust installation and PATH setup happens in a single shell session to ensure
+    cargo is available for the package build.
+    """
     includes = ["TOOLCHAIN_VERSION", "PYMONGO_BUILD_RUST", "PYMONGO_USE_RUST", "TEST_ARGS"]
-    args = [".evergreen/just.sh", "setup-tests", "${TEST_NAME}", ""]
-    setup_cmd = get_subprocess_exec(include_expansions_in_env=includes, args=args)
-    test_cmd = get_subprocess_exec(
-        include_expansions_in_env=includes, args=[".evergreen/just.sh", "run-tests"]
+
+    # Run everything in a single shell session to ensure Rust is available
+    # This combines: Rust installation + setup-tests + run-tests
+    # Note: get_subprocess_exec defaults to binary="bash", so we only need args
+    combined_cmd = get_subprocess_exec(
+        include_expansions_in_env=includes,
+        args=[
+            "-c",
+            # Source env.sh first to get the base PATH
+            "if [ -f .evergreen/scripts/env.sh ]; then "
+            ". .evergreen/scripts/env.sh; "
+            "fi; "
+            # Determine cargo path based on OS
+            'if [ "Windows_NT" = "${OS:-}" ]; then '
+            'CARGO_BIN="$USERPROFILE/.cargo/bin"; '
+            "else "
+            'CARGO_BIN="$HOME/.cargo/bin"; '
+            "fi; "
+            # Install Rust if needed
+            "if ! command -v cargo &> /dev/null; then "
+            'echo "Installing Rust..."; '
+            'curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y; '
+            "fi; "
+            # Ensure cargo is in PATH for all subsequent commands
+            'export PATH="$CARGO_BIN:$PATH"; '
+            'echo "Rust toolchain: $(rustc --version 2>/dev/null || echo not found)"; '
+            'echo "Cargo: $(cargo --version 2>/dev/null || echo not found)"; '
+            'echo "Cargo path: $(command -v cargo || echo not found)"; '
+            # Update env.sh to include cargo in PATH for subsequent shell sessions
+            "if [ -f .evergreen/scripts/env.sh ]; then "
+            'echo "export PATH=\\"$CARGO_BIN:\\$PATH\\"" >> .evergreen/scripts/env.sh; '
+            "fi; "
+            # Run setup-tests
+            'bash .evergreen/just.sh setup-tests "${TEST_NAME}" ""; '
+            # Run tests
+            "bash .evergreen/just.sh run-tests",
+        ],
     )
-    return "run rust tests", [setup_cmd, test_cmd]
+
+    return "run rust tests", [combined_cmd]
 
 
 mod = sys.modules[__name__]

.evergreen/scripts/install-dependencies.sh

@@ -30,7 +30,7 @@ fi
 
 # Ensure just is installed.
 if ! command -v just &>/dev/null; then
-  uv tool install rust-just
+  uv tool install rust-just || uv tool install --force rust-just
 fi
 
 popd > /dev/null

.evergreen/scripts/run_tests.py

@@ -151,6 +151,16 @@ def run() -> None:
     if os.environ.get("PYMONGOCRYPT_LIB"):
         handle_pymongocrypt()
 
+    # Check if Rust extension is being used
+    if os.environ.get("PYMONGO_USE_RUST") or os.environ.get("PYMONGO_BUILD_RUST"):
+        try:
+            import bson
+
+            LOGGER.info(f"BSON implementation: {bson.get_bson_implementation()}")
+            LOGGER.info(f"Has Rust: {bson.has_rust()}, Has C: {bson.has_c()}")
+        except Exception as e:
+            LOGGER.warning(f"Could not check BSON implementation: {e}")
+
     LOGGER.info(f"Test setup:\n{AUTH=}\n{SSL=}\n{UV_ARGS=}\n{TEST_ARGS=}")
 
     # Record the start time for a perf test.

.evergreen/scripts/setup_tests.py

@@ -32,6 +32,8 @@
     "UV_PYTHON",
     "REQUIRE_FIPS",
     "IS_WIN32",
+    "PYMONGO_USE_RUST",
+    "PYMONGO_BUILD_RUST",
 ]
 
 # Map the test name to test extra.