RUST-1219, RUST-863: Assert that a ping succeeds in DNS seedlist tests; sync DB name with comma tests (#824)

Author: kmahar

src/test/spec/initial_dns_seedlist_discovery.rs

@@ -5,7 +5,7 @@ use tokio::sync::RwLockReadGuard;
 
 use crate::{
     bson::doc,
-    client::{auth::AuthMechanism, Client},
+    client::Client,
     options::{ClientOptions, ResolverConfig},
     runtime,
     test::{log_uncaptured, run_spec_test, TestClient, CLIENT_OPTIONS, LOCK},
@@ -25,6 +25,7 @@ struct TestFile {
     num_seeds: Option<usize>,
     #[serde(rename = "numHosts")]
     num_hosts: Option<usize>,
+    ping: Option<bool>,
 }
 
 #[derive(Debug, Deserialize, PartialEq)]
@@ -136,37 +137,19 @@ async fn run_test(mut test_file: TestFile) {
             "skipping initial_dns_seedlist_discovery test case due to TLS requirement mismatch",
         )
     } else {
-        // If the connection URI provides authentication information, manually create the user
-        // before connecting.
-        if let Some(ParsedOptions {
-            user: Some(ref user),
-            password: Some(ref pwd),
-            ref db,
-        }) = test_file.parsed_options
-        {
-            client
-                .drop_and_create_user(
-                    user,
-                    pwd.as_str(),
-                    &[],
-                    &[AuthMechanism::ScramSha1, AuthMechanism::ScramSha256],
-                    db.as_deref(),
-                )
-                .await
-                .unwrap();
-        }
-
         let mut options_with_tls = options.clone();
         if requires_tls {
             options_with_tls.tls = CLIENT_OPTIONS.get().await.tls.clone();
         }
 
         let client = Client::with_options(options_with_tls).unwrap();
-        client
-            .database("db")
-            .run_command(doc! { "ping" : 1 }, None)
-            .await
-            .unwrap();
+        if test_file.ping == Some(true) {
+            client
+                .database("db")
+                .run_command(doc! { "ping" : 1 }, None)
+                .await
+                .unwrap();
+        }
 
         if let Some(ref mut hosts) = test_file.hosts {
             hosts.sort();

src/test/spec/json/initial-dns-seedlist-discovery/README.rst

@@ -114,31 +114,49 @@ These YAML and JSON files contain the following fields:
 - ``error``: indicates that the parsing of the URI, or the resolving or
   contents of the SRV or TXT records included errors.
 - ``comment``: a comment to indicate why a test would fail.
+- ``ping``: if true, the test runner should run a "ping" operation after
+  initializing a MongoClient.
 
 .. _`Connection String`: ../../connection-string/connection-string-spec.rst
 .. _`URI options`: ../../uri-options/uri-options.rst
 
-For each file, create a MongoClient initialized with the ``mongodb+srv``
-connection string.
-
-If ``seeds`` is specified, drivers SHOULD verify that the set of hosts in the
-client's initial seedlist matches the list in ``seeds``. If ``numSeeds`` is
-specified, drivers SHOULD verify that the size of that set matches ``numSeeds``.
-
-If ``hosts`` is specified, drivers MUST verify that the set of
-ServerDescriptions in the client's TopologyDescription eventually matches the
-list in ``hosts``. If ``numHosts`` is specified, drivers MUST verify that the
-size of that set matches ``numHosts``.
-
-If ``options`` is specified, drivers MUST verify each of the values under
-``options`` match the MongoClient's parsed value for that option. There may be
-other options parsed by the MongoClient as well, which a test does not verify.
-
-If ``parsed_options`` is specified, drivers MUST verify that each of the values
-under ``parsed_options`` match the MongoClient's parsed value for that option.
-Supported values include, but are not limited to, ``user`` and ``password``
-(parsed from ``UserInfo``) and ``auth_database`` (parsed from
-``Auth database``).
-
-If ``error`` is specified and ``true``, drivers MUST verify that an error has
-been thrown.
+For each YAML file:
+
+- Create a MongoClient initialized with the ``mongodb+srv``
+  connection string.
+- Run run a "ping" operation if ``ping`` in the test file is true.
+
+Assertions:
+
+- If ``seeds`` is specified, drivers SHOULD verify that the set of hosts in the
+  client's initial seedlist matches the list in ``seeds``. If ``numSeeds`` is
+  specified, drivers SHOULD verify that the size of that set matches
+  ``numSeeds``.
+
+- If ``hosts`` is specified, drivers MUST verify that the set of
+  ServerDescriptions in the client's TopologyDescription eventually matches the
+  list in ``hosts``. If ``numHosts`` is specified, drivers MUST verify that the
+  size of that set matches ``numHosts``.
+
+- If ``options`` is specified, drivers MUST verify each of the values under
+  ``options`` match the MongoClient's parsed value for that option. There may be
+  other options parsed by the MongoClient as well, which a test does not verify.
+
+- If ``parsed_options`` is specified, drivers MUST verify that each of the
+  values under ``parsed_options`` match the MongoClient's parsed value for that
+  option. Supported values include, but are not limited to, ``user`` and
+  ``password`` (parsed from ``UserInfo``) and ``auth_database`` (parsed from
+  ``Auth database``).
+
+- If ``error`` is specified and ``true``, drivers MUST verify that initializing
+  the MongoClient throws an error. If ``error`` is not specified or is
+  ``false``, both initializing the MongoClient and running a ping operation must
+  succeed without throwing any errors.
+
+- If ``ping`` is specified and ``true``, drivers MUST verify that running a
+  "ping" operation using the initialized MongoClient succeeds. If ``ping`` is
+  not specified or is ``false``, drivers MUST NOT run a "ping" operation.
+  **Note:** These tests are expected to be run against MongoDB databases with
+  and without authentication enabled. The "ping" operation does not require
+  authentication so should succeed, even though the test URIs do not have
+  correct authentication information.

src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-directConnection.json

@@ -10,5 +10,6 @@
     "loadBalanced": true,
     "ssl": true,
     "directConnection": false
-  }
+  },
+  "ping": true
 }

src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-directConnection.yml

@@ -11,3 +11,4 @@ options:
     loadBalanced: true
     ssl: true
     directConnection: false
+ping: true

src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-txt.json

@@ -9,5 +9,6 @@
   "options": {
     "loadBalanced": true,
     "ssl": true
-  }
+  },
+  "ping": true
 }

src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/loadBalanced-true-txt.yml

@@ -8,3 +8,4 @@ hosts:
 options:
     loadBalanced: true
     ssl: true
+ping: true

src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero-txt.json

@@ -10,5 +10,6 @@
     "loadBalanced": true,
     "srvMaxHosts": 0,
     "ssl": true
-  }
+  },
+  "ping": true
 }

src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero-txt.yml

@@ -8,3 +8,4 @@ options:
     loadBalanced: true
     srvMaxHosts: 0
     ssl: true
+ping: true

src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero.json

@@ -10,5 +10,6 @@
     "loadBalanced": true,
     "srvMaxHosts": 0,
     "ssl": true
-  }
+  },
+  "ping": true
 }

src/test/spec/json/initial-dns-seedlist-discovery/load-balanced/srvMaxHosts-zero.yml

@@ -8,3 +8,4 @@ options:
     loadBalanced: true
     srvMaxHosts: 0
     ssl: true
+ping: true