Integrate Rust extension testing into existing test infrastructure

aclark4life · aclark4life · commit 4a64a2833783 · 2026-02-13T15:56:01.000-05:00
- Remove separate Rust-specific test workflows and scripts
- Add Rust environment variables (PYMONGO_BUILD_RUST, PYMONGO_USE_RUST) to Evergreen test functions
- Replace separate Rust variants with variants that run existing standard tests with Rust enabled
- Add Rust extension testing to GitHub Actions build job via matrix dimension
- Rust extensions now tested alongside C extensions using same test tasks
diff --git a/.evergreen/generated_configs/functions.yml b/.evergreen/generated_configs/functions.yml
@@ -111,6 +111,8 @@ functions:
           - LOAD_BALANCER
           - LOCAL_ATLAS
           - NO_EXT
+          - PYMONGO_BUILD_RUST
+          - PYMONGO_USE_RUST
       type: test
     - command: expansions.update
       params:
@@ -152,6 +154,8 @@ functions:
           - IS_WIN32
           - REQUIRE_FIPS
           - TEST_MIN_DEPS
+          - PYMONGO_BUILD_RUST
+          - PYMONGO_USE_RUST
       type: test
     - command: subprocess.exec
       params:
diff --git a/.evergreen/generated_configs/tasks.yml b/.evergreen/generated_configs/tasks.yml
@@ -2611,84 +2611,6 @@ tasks:
       - func: send dashboard data
     tags: [perf]
 
-  # Rust extension tests
-  - name: test-rust-latest-python3.10-noauth-nossl-standalone
-    commands:
-      - func: run server
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          TOPOLOGY: standalone
-          VERSION: latest
-          PYMONGO_BUILD_RUST: "1"
-          PYMONGO_USE_RUST: "1"
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: nossl
-          TOPOLOGY: standalone
-          VERSION: latest
-          PYMONGO_BUILD_RUST: "1"
-          PYMONGO_USE_RUST: "1"
-          TOOLCHAIN_VERSION: "3.10"
-          TEST_NAME: default_sync
-    tags:
-      - test-rust
-      - python-3.10
-      - standalone-noauth-nossl
-      - rust
-      - pr
-  - name: test-rust-latest-python3.12-noauth-ssl-replica-set
-    commands:
-      - func: run server
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          TOPOLOGY: replica_set
-          VERSION: latest
-          PYMONGO_BUILD_RUST: "1"
-          PYMONGO_USE_RUST: "1"
-      - func: run tests
-        vars:
-          AUTH: noauth
-          SSL: ssl
-          TOPOLOGY: replica_set
-          VERSION: latest
-          PYMONGO_BUILD_RUST: "1"
-          PYMONGO_USE_RUST: "1"
-          TOOLCHAIN_VERSION: "3.12"
-          TEST_NAME: default_sync
-    tags:
-      - test-rust
-      - python-3.12
-      - replica_set-noauth-ssl
-      - rust
-  - name: test-rust-latest-python3.14-auth-ssl-sharded-cluster
-    commands:
-      - func: run server
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          VERSION: latest
-          PYMONGO_BUILD_RUST: "1"
-          PYMONGO_USE_RUST: "1"
-      - func: run tests
-        vars:
-          AUTH: auth
-          SSL: ssl
-          TOPOLOGY: sharded_cluster
-          VERSION: latest
-          PYMONGO_BUILD_RUST: "1"
-          PYMONGO_USE_RUST: "1"
-          TOOLCHAIN_VERSION: "3.14"
-          TEST_NAME: default_sync
-    tags:
-      - test-rust
-      - python-3.14
-      - sharded_cluster-auth-ssl
-      - rust
-
   # Search index tests
   - name: test-search-index-helpers
     commands:
diff --git a/.evergreen/generated_configs/variants.yml b/.evergreen/generated_configs/variants.yml
@@ -477,32 +477,32 @@ buildvariants:
     expansions:
       SUB_TEST_NAME: pyopenssl
 
-  # Rust extension tests
-  - name: test-rust-extension
+  # Rust tests
+  - name: test-with-rust-extension
     tasks:
-      - name: .test-rust
-    display_name: Test Rust Extension
+      - name: .test-standard .server-latest .pr
+    display_name: Test with Rust Extension
     run_on:
       - rhel87-small
     expansions:
       PYMONGO_BUILD_RUST: "1"
       PYMONGO_USE_RUST: "1"
     tags: [rust, pr]
-  - name: test-rust-extension---macos-arm64
+  - name: test-with-rust-extension---macos-arm64
     tasks:
-      - name: .test-rust !.pr
-    display_name: Test Rust Extension - macOS ARM64
+      - name: .test-standard .server-latest !.pr
+    display_name: Test with Rust Extension - macOS ARM64
     run_on:
       - macos-14-arm64
     batchtime: 10080
     expansions:
       PYMONGO_BUILD_RUST: "1"
       PYMONGO_USE_RUST: "1"
     tags: [rust]
-  - name: test-rust-extension---windows
+  - name: test-with-rust-extension---windows
     tasks:
-      - name: .test-rust !.pr
-    display_name: Test Rust Extension - Windows
+      - name: .test-standard .server-latest !.pr
+    display_name: Test with Rust Extension - Windows
     run_on:
       - windows-64-vsMulti-small
     batchtime: 10080
diff --git a/.evergreen/run-rust-tests.sh b/.evergreen/run-rust-tests.sh
diff --git a/.evergreen/scripts/generate_config.py b/.evergreen/scripts/generate_config.py
@@ -1195,6 +1195,8 @@ def create_run_server_func():
         "LOAD_BALANCER",
         "LOCAL_ATLAS",
         "NO_EXT",
+        "PYMONGO_BUILD_RUST",
+        "PYMONGO_USE_RUST",
     ]
     args = [".evergreen/just.sh", "run-server", "${TEST_NAME}"]
     sub_cmd = get_subprocess_exec(include_expansions_in_env=includes, args=args)
@@ -1228,6 +1230,8 @@ def create_run_tests_func():
         "IS_WIN32",
         "REQUIRE_FIPS",
         "TEST_MIN_DEPS",
+        "PYMONGO_BUILD_RUST",
+        "PYMONGO_USE_RUST",
     ]
     args = [".evergreen/just.sh", "setup-tests", "${TEST_NAME}", "${SUB_TEST_NAME}"]
     setup_cmd = get_subprocess_exec(include_expansions_in_env=includes, args=args)
@@ -1289,60 +1293,15 @@ def create_send_dashboard_data_func():
     return "send dashboard data", cmds
 
 
-def create_rust_extension_tasks():
-    """Create tasks for testing the Rust BSON extension."""
-    tasks = []
-    # Test Rust extension on a subset of Python versions and topologies
-    # Focus on min, max, and latest stable Python versions
-    test_pythons = [MIN_MAX_PYTHON[0], "3.12", MIN_MAX_PYTHON[-1]]
-
-    for python, topology in zip_cycle(
-        test_pythons, ["standalone", "replica_set", "sharded_cluster"]
-    ):
-        if "t" in python:
-            # Skip free-threaded Python for now (Rust extension may need updates)
-            continue
-
-        auth, ssl = get_standard_auth_ssl(topology)
-        tags = [
-            "test-rust",
-            f"python-{python}",
-            f"{topology}-{auth}-{ssl}",
-            "rust",
-        ]
-
-        # Add PR tag for one configuration to run on every PR (Python 3.10 on standalone)
-        if python == MIN_MAX_PYTHON[0] and topology == "standalone":
-            tags.append("pr")
-
-        expansions = dict(
-            AUTH=auth,
-            SSL=ssl,
-            TOPOLOGY=topology,
-            VERSION="latest",
-            PYMONGO_BUILD_RUST="1",
-            PYMONGO_USE_RUST="1",
-        )
-
-        name = get_task_name("test-rust", python=python, **expansions)
-        server_func = FunctionCall(func="run server", vars=expansions)
-        test_vars = expansions.copy()
-        test_vars["TOOLCHAIN_VERSION"] = python
-        test_vars["TEST_NAME"] = "default_sync"
-        test_func = FunctionCall(func="run tests", vars=test_vars)
-        tasks.append(EvgTask(name=name, tags=tags, commands=[server_func, test_func]))
-
-    return tasks
-
-
-def create_rust_extension_variants():
-    """Create build variants for testing the Rust BSON extension."""
+def create_rust_variants():
+    """Create build variants that test with Rust extension alongside C extension."""
     variants = []
 
-    # Test on Linux (primary platform) - runs on PRs
+    # Test Rust on Linux (primary platform) - runs on PRs
+    # Run standard tests with Rust enabled (both sync and async)
     variant = create_variant(
-        [".test-rust"],
-        "Test Rust Extension",
+        [".test-standard .server-latest .pr"],
+        "Test with Rust Extension",
         host=DEFAULT_HOST,
         tags=["rust", "pr"],
         expansions=dict(
@@ -1354,8 +1313,8 @@ def create_rust_extension_variants():
 
     # Test on macOS ARM64 (important for M1/M2 Macs)
     variant = create_variant(
-        [".test-rust !.pr"],
-        "Test Rust Extension - macOS ARM64",
+        [".test-standard .server-latest !.pr"],
+        "Test with Rust Extension - macOS ARM64",
         host=HOSTS["macos-arm64"],
         tags=["rust"],
         batchtime=BATCHTIME_WEEK,
@@ -1368,8 +1327,8 @@ def create_rust_extension_variants():
 
     # Test on Windows (important for cross-platform compatibility)
     variant = create_variant(
-        [".test-rust !.pr"],
-        "Test Rust Extension - Windows",
+        [".test-standard .server-latest !.pr"],
+        "Test with Rust Extension - Windows",
         host=HOSTS["win64"],
         tags=["rust"],
         batchtime=BATCHTIME_WEEK,
diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
@@ -61,8 +61,13 @@ jobs:
         os: [ubuntu-latest]
         python-version: ["3.10", "pypy-3.11", "3.13t"]
         mongodb-version: ["8.0"]
+        extension: ["c", "rust"]
+        exclude:
+          # Don't test Rust with pypy
+          - python-version: "pypy-3.11"
+            extension: "rust"
 
-    name: CPython ${{ matrix.python-version }}-${{ matrix.os }}
+    name: CPython ${{ matrix.python-version }}-${{ matrix.os }}-${{ matrix.extension }}
     steps:
       - uses: actions/checkout@v6
         with:
@@ -72,12 +77,18 @@ jobs:
         with:
           enable-cache: true
           python-version: ${{ matrix.python-version }}
+      - name: Install Rust toolchain
+        if: matrix.extension == 'rust'
+        uses: dtolnay/rust-toolchain@stable
       - id: setup-mongodb
         uses: mongodb-labs/drivers-evergreen-tools@master
         with:
           version: "${{ matrix.mongodb-version }}"
       - name: Run tests
         run: uv run --extra test pytest -v
+        env:
+          PYMONGO_BUILD_RUST: ${{ matrix.extension == 'rust' && '1' || '' }}
+          PYMONGO_USE_RUST: ${{ matrix.extension == 'rust' && '1' || '' }}
 
   coverage:
     # This enables a coverage report for a given PR, which will be augmented by
diff --git a/.github/workflows/test-rust.yml b/.github/workflows/test-rust.yml
