RUST-2055 Filter OIDC tests with cargo nextest (#1317)

Author: isabelatkinson

.evergreen/config.yml

@@ -286,7 +286,7 @@ buildvariants:
       - test-k8s-oidc-task-group
 
   - name: oidc-macos
-    display_name: "OIDC Macos"
+    display_name: "OIDC MacOS"
     patchable: true
     run_on:
       - macos-14
@@ -645,6 +645,7 @@ task_groups:
             ${PREPARE_SHELL}
             ${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh
     teardown_task:
+      - func: "upload test results"
       - command: subprocess.exec
         params:
           binary: bash
@@ -1177,7 +1178,7 @@ tasks:
           - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/azure/run-driver-test.sh
         env:
           AZUREOIDC_DRIVERS_TAR_FILE: ${STATIC_TEST_TARBALL}
-          AZUREOIDC_TEST_CMD: "ls -laR data && PROJECT_DIRECTORY='.' OIDC_ENV=azure OIDC=oidc TEST_FILE=./${STATIC_TEST_BINARY} ./.evergreen/run-mongodb-oidc-test.sh"
+          AZUREOIDC_TEST_CMD: "source ./env.sh && RUST_BACKTRACE=1 ./${STATIC_TEST_BINARY} test::spec::oidc_skip_ci::azure -- --no-capture"
 
   - name: "oidc-auth-test-gcp-latest"
     commands:
@@ -1193,7 +1194,7 @@ tasks:
           - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/gcp/run-driver-test.sh
         env:
           GCPOIDC_DRIVERS_TAR_FILE: ${STATIC_TEST_TARBALL}
-          GCPOIDC_TEST_CMD: "ls -la && PROJECT_DIRECTORY='.' OIDC_ENV=gcp OIDC=oidc TEST_FILE=./${STATIC_TEST_BINARY} ./.evergreen/run-mongodb-oidc-test.sh"
+          GCPOIDC_TEST_CMD: "source ./secrets-export.sh && RUST_BACKTRACE=1 ./${STATIC_TEST_BINARY} test::spec::oidc_skip_ci::gcp -- --no-capture"
 
   - name: "oidc-auth-test-k8s-latest"
     commands:
@@ -1700,16 +1701,16 @@ functions:
         role_arn: ${aws_test_secrets_role}
 
   "run oidc auth test with test credentials":
-    - command: shell.exec
+    - command: subprocess.exec
       type: test
       params:
         working_dir: src
-        shell: bash
-        include_expansions_in_env: ["DRIVERS_TOOLS", "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
-        script: |
-          ${PREPARE_SHELL}
-          export OIDC="oidc"
-          .evergreen/run-mongodb-oidc-test.sh
+        binary: bash
+        include_expansions_in_env:
+          - DRIVERS_TOOLS
+          - PROJECT_DIRECTORY
+        args:
+          - .evergreen/run-mongodb-oidc-test.sh
 
   "start happy eyeballs server":
     - command: subprocess.exec
@@ -1953,7 +1954,7 @@ functions:
         - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/run-driver-test.sh
       env:
         K8S_DRIVERS_TAR_FILE: ${STATIC_TEST_TARBALL}
-        K8S_TEST_CMD: "ls -la && PROJECT_DIRECTORY='.' OIDC_ENV=k8s OIDC=oidc TEST_FILE=./${STATIC_TEST_BINARY} ./.evergreen/run-mongodb-oidc-test.sh"
+        K8S_TEST_CMD: "RUST_BACKTRACE=1 ./${STATIC_TEST_BINARY} test::spec::oidc_skip_ci::k8s -- --no-capture"
       include_expansions_in_env:
         - AWS_ACCESS_KEY_ID
         - AWS_SECRET_ACCESS_KEY

.evergreen/run-mongodb-oidc-test.sh

@@ -3,44 +3,23 @@
 set +x          # Disable debug trace
 set -o errexit  # Exit the script with error if any of the commands fail
 
+source .evergreen/env.sh
+source .evergreen/cargo-test.sh
+
+CARGO_OPTIONS+=("--ignore-default-filter")
+
 echo "Running MONGODB-OIDC authentication tests"
 
-OIDC_ENV=${OIDC_ENV:-"test"}
-
-export TEST_AUTH_OIDC=1
-export COVERAGE=1
-export AUTH="auth"
-
-if [ $OIDC_ENV == "test" ]; then
-
-    source .evergreen/env.sh
-    source .evergreen/cargo-test.sh
-    # Make sure DRIVERS_TOOLS is set.
-    if [ -z "$DRIVERS_TOOLS" ]; then
-        echo "Must specify DRIVERS_TOOLS"
-        exit 1
-    fi
-    source ${DRIVERS_TOOLS}/.evergreen/auth_oidc/secrets-export.sh
-
-    cargo nextest run test::spec::oidc::basic --no-capture --profile ci
-    RESULT=$?
-    cp target/nextest/ci/junit.xml results.xml
-elif [ $OIDC_ENV == "azure" ]; then
-    source ./env.sh
-
-    $TEST_FILE test::spec::oidc::azure --nocapture
-    RESULT=$?
-elif [ $OIDC_ENV == "gcp" ]; then
-    source ./secrets-export.sh
-
-    $TEST_FILE test::spec::oidc::gcp --nocapture
-    RESULT=$?
-elif [ $OIDC_ENV == "k8s" ]; then
-    $TEST_FILE test::spec::oidc::k8s --nocapture
-    RESULT=$?
-else
-    echo "Unrecognized OIDC_ENV '${OIDC_ENV}'"
+# Make sure DRIVERS_TOOLS is set.
+if [ -z "$DRIVERS_TOOLS" ]; then
+    echo "Must specify DRIVERS_TOOLS"
     exit 1
 fi
 
-exit $RESULT
+source ${DRIVERS_TOOLS}/.evergreen/auth_oidc/secrets-export.sh
+
+set +o errexit
+
+cargo_test test::spec::oidc_skip_ci::basic
+
+exit $CARGO_RESULT

src/test/spec.rs

@@ -10,7 +10,8 @@ mod handshake;
 #[cfg(feature = "dns-resolver")]
 mod initial_dns_seedlist_discovery;
 mod load_balancers;
-mod oidc;
+#[path = "spec/oidc.rs"]
+mod oidc_skip_ci;
 mod read_write_concern;
 mod retryable_reads;
 mod retryable_writes;