RUST-2055 Filter remaining tests with cargo-nextest (#1311)

Author: isabelatkinson

.evergreen/run-csfle-tests.sh

@@ -31,7 +31,6 @@ PATH=${PATH}:${DRIVERS_TOOLS}/mongodb/bin
 set +o errexit
 
 cargo_test test::csfle
-cargo_test test::spec::client_side_encryption
 
 FEATURE_FLAGS+=("aws-auth")
 cargo_test on_demand_aws::success

.evergreen/run-x509-tests.sh

@@ -7,6 +7,8 @@ set -o pipefail
 source .evergreen/env.sh
 source .evergreen/cargo-test.sh
 
+CARGO_OPTIONS+=("--ignore-default-filter")
+
 export SUBJECT=$(openssl x509 -subject -nameopt RFC2253 -noout -inform PEM -in $CERT_PATH)
 
 # Strip `subject=` prefix from the subject

src/test/client.rs

@@ -564,11 +564,8 @@ async fn saslprep() {
 
 #[tokio::test]
 #[function_name::named]
-async fn x509_auth() {
-    let username = match std::env::var("MONGO_X509_USER") {
-        Ok(user) => user,
-        Err(_) => return,
-    };
+async fn x509_auth_skip_ci() {
+    let username = std::env::var("MONGO_X509_USER").expect("MONGO_X509_USER");
 
     let client = Client::for_test().await;
     let drop_user_result = client

src/test/csfle.rs

@@ -15,6 +15,8 @@ mod on_demand_aws; // requires AWS credentials to be set or unset
 mod on_demand_gcp; // requires GCP
 #[path = "csfle/prose.rs"]
 mod prose; // requires environment variables listed below
+#[path = "csfle/spec.rs"]
+mod spec; // requires environment variables listed below
 
 use std::{env, path::PathBuf};
 

src/test/spec/client_side_encryption.rs renamed to src/test/csfle/spec.rs

@@ -1,7 +1,5 @@
 mod auth;
 mod change_streams;
-#[cfg(feature = "in-use-encryption")]
-mod client_side_encryption;
 mod collection_management;
 mod command_monitoring;
 mod connection_stepdown;
@@ -23,7 +21,7 @@ mod sessions;
 mod trace;
 mod transactions;
 pub(crate) mod unified_runner;
-mod v2_runner;
+pub(crate) mod v2_runner;
 mod versioned_api;
 mod write_error;
 

src/test/spec.rs

@@ -1,4 +1,4 @@
-use crate::test::spec::unified_runner::run_unified_tests;
+use crate::test::{spec::unified_runner::run_unified_tests, SERVERLESS};
 
 #[tokio::test(flavor = "multi_thread")]
 async fn run_unified() {
@@ -41,7 +41,7 @@ async fn run_unified() {
         "Database-level aggregate with $merge omits read preference for pre-5.0 server",
     ];
     // TODO: remove this manual skip when this test is fixed to skip on serverless
-    if std::env::var("SERVERLESS").is_ok() {
+    if *SERVERLESS {
         skipped_tests.push("inserting _id with type null via clientBulkWrite");
     }
 

src/test/spec/crud.rs

@@ -144,10 +144,8 @@ impl RunOnRequirement {
                 return Err("requires auth".to_string());
             }
         }
-        if let Some(csfle) = &self.csfle {
-            if *csfle && std::env::var("CSFLE_LOCAL_KEY").is_err() {
-                return Err("requires csfle env".to_string());
-            }
+        if self.csfle == Some(true) && !cfg!(feature = "in-use-encryption") {
+            return Err("requires csfle but in-use-encryption feature not enabled".to_string());
         }
         Ok(())
     }