RUST-395 Log skipped tests (#523)

Author: karmenliang

src/client/session/test/causal_consistency.rs

@@ -7,7 +7,7 @@ use crate::{
     coll::options::CollectionOptions,
     error::Result,
     options::ReadConcern,
-    test::{CommandEvent, EventClient, LOCK},
+    test::{log_uncaptured, CommandEvent, EventClient, LOCK},
     ClientSession,
     Collection,
 };
@@ -150,8 +150,8 @@ async fn new_session_operation_time_null() {
     let client = EventClient::new().await;
 
     if client.is_standalone() {
-        println!(
-            "skipping new_session_operation_time_null due to unsupported topology: standalone"
+        log_uncaptured(
+            "skipping new_session_operation_time_null due to unsupported topology: standalone",
         );
         return;
     }
@@ -169,8 +169,8 @@ async fn first_read_no_after_cluser_time() {
     let client = EventClient::new().await;
 
     if client.is_standalone() {
-        println!(
-            "skipping first_read_no_after_cluser_time due to unsupported topology: standalone"
+        log_uncaptured(
+            "skipping first_read_no_after_cluser_time due to unsupported topology: standalone",
         );
         return;
     }
@@ -208,7 +208,7 @@ async fn first_op_update_op_time() {
     let client = EventClient::new().await;
 
     if client.is_standalone() {
-        println!("skipping first_op_update_op_time due to unsupported topology: standalone");
+        log_uncaptured("skipping first_op_update_op_time due to unsupported topology: standalone");
         return;
     }
 
@@ -258,8 +258,8 @@ async fn read_includes_after_cluster_time() {
     let client = EventClient::new().await;
 
     if client.is_standalone() {
-        println!(
-            "skipping read_includes_after_cluster_time due to unsupported topology: standalone"
+        log_uncaptured(
+            "skipping read_includes_after_cluster_time due to unsupported topology: standalone",
         );
         return;
     }
@@ -303,9 +303,9 @@ async fn find_after_write_includes_after_cluster_time() {
     let client = EventClient::new().await;
 
     if client.is_standalone() {
-        println!(
+        log_uncaptured(
             "skipping find_after_write_includes_after_cluster_time due to unsupported topology: \
-             standalone"
+             standalone",
         );
         return;
     }
@@ -345,9 +345,9 @@ async fn not_causally_consistent_omits_after_cluster_time() {
     let client = EventClient::new().await;
 
     if client.is_standalone() {
-        println!(
+        log_uncaptured(
             "skipping not_causally_consistent_omits_after_cluster_time due to unsupported \
-             topology: standalone"
+             topology: standalone",
         );
         return;
     }
@@ -383,7 +383,7 @@ async fn omit_after_cluster_time_standalone() {
     let client = EventClient::new().await;
 
     if !client.is_standalone() {
-        println!("skipping omit_after_cluster_time_standalone due to unsupported topology");
+        log_uncaptured("skipping omit_after_cluster_time_standalone due to unsupported topology");
         return;
     }
 
@@ -418,8 +418,8 @@ async fn omit_default_read_concern_level() {
     let client = EventClient::new().await;
 
     if client.is_standalone() {
-        println!(
-            "skipping omit_default_read_concern_level due to unsupported topology: standalone"
+        log_uncaptured(
+            "skipping omit_default_read_concern_level due to unsupported topology: standalone",
         );
         return;
     }
@@ -458,9 +458,9 @@ async fn test_causal_consistency_read_concern_merge() {
 
     let client = EventClient::new().await;
     if client.is_standalone() {
-        println!(
+        log_uncaptured(
             "skipping test_causal_consistency_read_concern_merge due to unsupported topology: \
-             standalone"
+             standalone",
         );
         return;
     }
@@ -508,7 +508,7 @@ async fn omit_cluster_time_standalone() {
 
     let client = EventClient::new().await;
     if !client.is_standalone() {
-        println!("skipping omit_cluster_time_standalone due to unsupported topology");
+        log_uncaptured("skipping omit_cluster_time_standalone due to unsupported topology");
         return;
     }
 
@@ -530,7 +530,7 @@ async fn cluster_time_sent_in_commands() {
 
     let client = EventClient::new().await;
     if client.is_standalone() {
-        println!("skipping cluster_time_sent_in_commands due to unsupported topology");
+        log_uncaptured("skipping cluster_time_sent_in_commands due to unsupported topology");
         return;
     }
 

src/client/session/test/mod.rs

@@ -13,7 +13,7 @@ use crate::{
     options::{Acknowledgment, FindOptions, ReadConcern, ReadPreference, WriteConcern},
     sdam::ServerInfo,
     selection_criteria::SelectionCriteria,
-    test::{EventClient, TestClient, CLIENT_OPTIONS, LOCK},
+    test::{log_uncaptured, EventClient, TestClient, CLIENT_OPTIONS, LOCK},
     Collection,
     RUNTIME,
 };
@@ -452,7 +452,9 @@ async fn find_and_getmore_share_session() {
 
     let client = EventClient::new().await;
     if client.is_standalone() {
-        println!("skipping find_and_getmore_share_session due to unsupported topology: Standalone");
+        log_uncaptured(
+            "skipping find_and_getmore_share_session due to unsupported topology: Standalone",
+        );
         return;
     }
 

src/cmap/test/integration.rs

@@ -12,7 +12,15 @@ use crate::{
     operation::CommandResponse,
     sdam::ServerUpdateSender,
     selection_criteria::ReadPreference,
-    test::{FailCommandOptions, FailPoint, FailPointMode, TestClient, CLIENT_OPTIONS, LOCK},
+    test::{
+        log_uncaptured,
+        FailCommandOptions,
+        FailPoint,
+        FailPointMode,
+        TestClient,
+        CLIENT_OPTIONS,
+        LOCK,
+    },
     RUNTIME,
 };
 use semver::VersionReq;
@@ -79,7 +87,7 @@ async fn concurrent_connections() {
 
     let mut options = CLIENT_OPTIONS.clone();
     if options.load_balanced.unwrap_or(false) {
-        println!("skipping concurrent_connections test due to load-balanced topology");
+        log_uncaptured("skipping concurrent_connections test due to load-balanced topology");
         return;
     }
     options.direct_connection = Some(true);
@@ -89,8 +97,8 @@ async fn concurrent_connections() {
     let version = VersionReq::parse(">= 4.2.9").unwrap();
     // blockConnection failpoint option only supported in 4.2.9+.
     if !version.matches(&client.server_version) {
-        println!(
-            "skipping concurrent_connections test due to server not supporting failpoint option"
+        log_uncaptured(
+            "skipping concurrent_connections test due to server not supporting failpoint option",
         );
         return;
     }
@@ -169,8 +177,8 @@ async fn connection_error_during_establishment() {
 
     let mut client_options = CLIENT_OPTIONS.clone();
     if client_options.load_balanced.unwrap_or(false) {
-        println!(
-            "skipping connection_error_during_establishment test due to load-balanced topology"
+        log_uncaptured(
+            "skipping connection_error_during_establishment test due to load-balanced topology",
         );
         return;
     }
@@ -181,10 +189,10 @@ async fn connection_error_during_establishment() {
 
     let client = TestClient::with_options(Some(client_options.clone())).await;
     if !client.supports_fail_command() {
-        println!(
+        log_uncaptured(format!(
             "skipping {} due to failCommand not being supported",
             function_name!()
-        );
+        ));
         return;
     }
 
@@ -236,10 +244,10 @@ async fn connection_error_during_operation() {
 
     let client = TestClient::with_options(options.into()).await;
     if !client.supports_fail_command() {
-        println!(
+        log_uncaptured(format!(
             "skipping {} due to failCommand not being supported",
             function_name!()
-        );
+        ));
         return;
     }
 

src/cmap/test/mod.rs

@@ -21,6 +21,7 @@ use crate::{
     test::{
         assert_matches,
         eq_matches,
+        log_uncaptured,
         run_spec_test,
         EventClient,
         MatchErrExt,
@@ -431,7 +432,10 @@ async fn cmap_spec_tests() {
 
         let mut options = CLIENT_OPTIONS.clone();
         if options.load_balanced.unwrap_or(false) {
-            println!("skipping due to load balanced topology");
+            log_uncaptured(format!(
+                "skipping {:?} due to load balanced topology",
+                test_file.description
+            ));
             return;
         }
         options.hosts.drain(1..);
@@ -440,7 +444,7 @@ async fn cmap_spec_tests() {
         if let Some(ref run_on) = test_file.run_on {
             let can_run_on = run_on.iter().any(|run_on| run_on.can_run_on(&client));
             if !can_run_on {
-                println!("skipping due to runOn requirements");
+                log_uncaptured("skipping due to runOn requirements");
                 return;
             }
         }

src/sdam/description/topology/server_selection/test/in_window.rs

@@ -12,6 +12,7 @@ use crate::{
     sdam::{description::topology::server_selection, Server},
     selection_criteria::ReadPreference,
     test::{
+        log_uncaptured,
         run_spec_test,
         Event,
         EventHandler,
@@ -118,12 +119,12 @@ async fn load_balancing_test() {
     let mut setup_client_options = CLIENT_OPTIONS.clone();
 
     if setup_client_options.load_balanced.unwrap_or(false) {
-        println!("skipping load_balancing_test test due to load-balanced topology");
+        log_uncaptured("skipping load_balancing_test test due to load-balanced topology");
         return;
     }
 
     if setup_client_options.credential.is_some() {
-        println!("skipping load_balancing_test test due to auth being enabled");
+        log_uncaptured("skipping load_balancing_test test due to auth being enabled");
         return;
     }
 
@@ -134,19 +135,19 @@ async fn load_balancing_test() {
     let version = VersionReq::parse(">= 4.2.9").unwrap();
     // blockConnection failpoint option only supported in 4.2.9+.
     if !version.matches(&setup_client.server_version) {
-        println!(
-            "skipping load_balancing_test test due to server not supporting blockConnection option"
+        log_uncaptured(
+            "skipping load_balancing_test test due to server not supporting blockConnection option",
         );
         return;
     }
 
     if !setup_client.is_sharded() {
-        println!("skipping load_balancing_test test due to topology not being sharded");
+        log_uncaptured("skipping load_balancing_test test due to topology not being sharded");
         return;
     }
 
     if CLIENT_OPTIONS.hosts.len() != 2 {
-        println!("skipping load_balancing_test test due to topology not having 2 mongoses");
+        log_uncaptured("skipping load_balancing_test test due to topology not having 2 mongoses");
         return;
     }
 

src/sdam/description/topology/test/sdam.rs

@@ -24,6 +24,7 @@ use crate::{
     },
     selection_criteria::TagSet,
     test::{
+        log_uncaptured,
         run_spec_test,
         Event,
         EventClient,
@@ -240,7 +241,7 @@ async fn run_test(test_file: TestFile) {
 
     // TODO: RUST-360 unskip tests that rely on topology version
     if test_description.contains("topologyVersion") {
-        println!("Skipping {} (RUST-360)", test_description);
+        log_uncaptured(format!("Skipping {} (RUST-360)", test_description));
         return;
     }
 
@@ -597,7 +598,7 @@ async fn heartbeat_events() {
     .await;
 
     if client.is_load_balanced() {
-        println!("skipping heartbeat_events tests due to load-balanced topology");
+        log_uncaptured("skipping heartbeat_events tests due to load-balanced topology");
         return;
     }
 
@@ -643,7 +644,7 @@ async fn direct_connection() {
 
     let test_client = TestClient::new().await;
     if !test_client.is_replica_set() {
-        println!("Skipping due to non-replica set topology");
+        log_uncaptured("Skipping direct_connection test due to non-replica set topology");
         return;
     }