RUST-452 Fix tests with async-std 1.6.0

Author: saghm

Cargo.toml

@@ -24,7 +24,7 @@ bson = "0.14.1"
 chrono = "0.4.7"
 derivative = "2.1.1"
 err-derive = "0.2.3"
-futures = "0.3.4"
+futures = "0.3.5"
 futures-intrusive = "0.3.0"
 hex = "0.4.0"
 hmac = "0.7.1"
@@ -48,7 +48,7 @@ webpki = "0.21.0"
 webpki-roots = "0.18.0"
 
 [dependencies.async-std]
-version = "1.5.0"
+version = "1.6.0"
 optional = true
 
 [dependencies.pbkdf2]

src/client/mod.rs

@@ -211,6 +211,11 @@ impl Client {
         )
     }
 
+    #[cfg(test)]
+    pub(crate) async fn num_sessions_in_pool(&self) -> usize {
+        self.inner.session_pool.len().await
+    }
+
     #[cfg(test)]
     pub(crate) async fn clear_session_pool(&self) {
         self.inner.session_pool.clear().await;

src/client/options/mod.rs

@@ -668,6 +668,15 @@ impl ClientOptions {
         Ok(options)
     }
 
+    #[cfg(test)]
+    pub(crate) fn parse_without_srv_resolution(s: &str) -> Result<Self> {
+        let parser = ClientOptionsParser::parse(s)?;
+        let options: Self = parser.into();
+        options.validate()?;
+
+        Ok(options)
+    }
+
     /// Gets the original SRV hostname specified when this ClientOptions was parsed from a URI.
     pub(crate) fn original_srv_hostname(&self) -> Option<&String> {
         self.original_srv_hostname.as_ref()

src/client/session/pool.rs

@@ -52,6 +52,11 @@ impl ServerSessionPool {
         }
     }
 
+    #[cfg(test)]
+    pub(crate) async fn len(&self) -> usize {
+        self.pool.lock().await.len()
+    }
+
     #[cfg(test)]
     pub(crate) async fn clear(&self) {
         self.pool.lock().await.clear();

src/runtime/mod.rs

@@ -69,7 +69,7 @@ impl AsyncRuntime {
     /// Run a future in the foreground, blocking on it completing.
     ///
     /// This will panic if called from a sychronous context when tokio is being used.
-    #[cfg_attr(not(feature = "sync"), cfg(test))]
+    #[cfg(feature = "sync")]
     pub(crate) fn block_on<F, T>(self, fut: F) -> T
     where
         F: Future<Output = T> + Send,

src/test/mod.rs

@@ -14,15 +14,15 @@ pub(crate) use self::{
 use lazy_static::lazy_static;
 
 use self::util::TestLock;
-use crate::{options::ClientOptions, RUNTIME};
+use crate::options::ClientOptions;
 
 const MAX_POOL_SIZE: u32 = 100;
 
 lazy_static! {
     pub(crate) static ref CLIENT_OPTIONS: ClientOptions = {
         let uri = std::env::var("MONGODB_URI")
             .unwrap_or_else(|_| "mongodb://localhost:27017".to_string());
-        let mut options = RUNTIME.block_on(ClientOptions::parse(&uri)).unwrap();
+        let mut options = ClientOptions::parse_without_srv_resolution(&uri).unwrap();
         options.max_pool_size = Some(MAX_POOL_SIZE);
 
         options

src/test/util/mod.rs

@@ -8,7 +8,7 @@ pub use self::{
     matchable::{assert_matches, Matchable},
 };
 
-use std::{collections::HashMap, fmt::Debug, sync::Arc};
+use std::{collections::HashMap, fmt::Debug, sync::Arc, time::Duration};
 
 use bson::{doc, oid::ObjectId, Bson};
 use semver::Version;
@@ -21,6 +21,7 @@ use crate::{
     options::{auth::AuthMechanism, ClientOptions, CreateCollectionOptions},
     Client,
     Collection,
+    RUNTIME,
 };
 
 pub struct TestClient {
@@ -79,6 +80,14 @@ impl TestClient {
         let info: BuildInfo = bson::from_bson(Bson::Document(response)).unwrap();
         let server_version = Version::parse(&info.version).unwrap();
 
+        // Clear the implicit sessions created by the above operations so that they don't mess with
+        // later tests.
+        while client.num_sessions_in_pool().await < 2 {
+            RUNTIME.delay_for(Duration::from_millis(250)).await;
+        }
+
+        client.clear_session_pool().await;
+
         Self {
             client,
             options,