more cleanup

Author: sleepyStick

test/asynchronous/test_client.py

@@ -132,7 +132,7 @@ class AsyncClientUnitTest(AsyncUnitTest):
 
     async def asyncSetUp(self) -> None:
         self.client = await self.async_rs_or_single_client(
-            connect=True, serverSelectionTimeoutMS=100
+            connect=False, serverSelectionTimeoutMS=100
         )
 
     @pytest.fixture(autouse=True)
@@ -258,7 +258,7 @@ async def test_get_default_database(self):
         c = await self.async_rs_or_single_client(
             "mongodb://%s:%d/foo"
             % (await async_client_context.host, await async_client_context.port),
-            connect=True,
+            connect=False,
         )
         self.assertEqual(AsyncDatabase(c, "foo"), c.get_default_database())
         # Test that default doesn't override the URI value.
@@ -274,7 +274,7 @@ async def test_get_default_database(self):
 
         c = await self.async_rs_or_single_client(
             "mongodb://%s:%d/" % (await async_client_context.host, await async_client_context.port),
-            connect=True,
+            connect=False,
         )
         self.assertEqual(AsyncDatabase(c, "foo"), c.get_default_database("foo"))
 
@@ -292,14 +292,14 @@ async def test_get_default_database_with_authsource(self):
             await async_client_context.host,
             await async_client_context.port,
         )
-        c = await self.async_rs_or_single_client(uri, connect=True)
+        c = await self.async_rs_or_single_client(uri, connect=False)
         self.assertEqual(AsyncDatabase(c, "foo"), c.get_default_database())
 
     async def test_get_database_default(self):
         c = await self.async_rs_or_single_client(
             "mongodb://%s:%d/foo"
             % (await async_client_context.host, await async_client_context.port),
-            connect=True,
+            connect=False,
         )
         self.assertEqual(AsyncDatabase(c, "foo"), c.get_database())
 
@@ -317,7 +317,7 @@ async def test_get_database_default_with_authsource(self):
             await async_client_context.host,
             await async_client_context.port,
         )
-        c = await self.async_rs_or_single_client(uri, connect=True)
+        c = await self.async_rs_or_single_client(uri, connect=False)
         self.assertEqual(AsyncDatabase(c, "foo"), c.get_database())
 
     async def test_primary_read_pref_with_tags(self):
@@ -817,7 +817,7 @@ async def test_init_disconnected(self):
         self.assertIsInstance(await c.is_primary, bool)
         c = await self.async_rs_or_single_client(connect=False)
         self.assertIsInstance(await c.is_mongos, bool)
-        c = await self.async_rs_or_single_client(connect=True)
+        c = await self.async_rs_or_single_client(connect=False)
         self.assertIsInstance(c.options.pool_options.max_pool_size, int)
         self.assertIsInstance(c.nodes, frozenset)
 
@@ -850,12 +850,12 @@ async def test_init_disconnected_with_auth(self):
 
     async def test_equality(self):
         seed = "{}:{}".format(*list(self.client._topology_settings.seeds)[0])
-        c = await self.async_rs_or_single_client(seed, connect=True)
+        c = await self.async_rs_or_single_client(seed, connect=False)
         self.assertEqual(async_client_context.client, c)
         # Explicitly test inequality
         self.assertFalse(async_client_context.client != c)
 
-        c = await self.async_rs_or_single_client("invalid.com", connect=True)
+        c = await self.async_rs_or_single_client("invalid.com", connect=False)
         self.assertNotEqual(async_client_context.client, c)
         self.assertTrue(async_client_context.client != c)
 
@@ -877,9 +877,9 @@ async def test_equality(self):
 
     async def test_hashable(self):
         seed = "{}:{}".format(*list(self.client._topology_settings.seeds)[0])
-        c = await self.async_rs_or_single_client(seed, connect=True)
+        c = await self.async_rs_or_single_client(seed, connect=False)
         self.assertIn(c, {async_client_context.client})
-        c = await self.async_rs_or_single_client("invalid.com", connect=True)
+        c = await self.async_rs_or_single_client("invalid.com", connect=False)
         self.assertNotIn(c, {async_client_context.client})
 
     async def test_host_w_port(self):
@@ -1618,7 +1618,7 @@ def init(self, *args):
         finally:
             ServerHeartbeatStartedEvent.__init__ = old_init  # type: ignore
 
-    async def test_small_heartbeat_frequency_ms(self):
+    def test_small_heartbeat_frequency_ms(self):
         uri = "mongodb://example/?heartbeatFrequencyMS=499"
         with self.assertRaises(ConfigurationError) as context:
             AsyncMongoClient(uri)

test/asynchronous/unified_format.py

@@ -1354,6 +1354,7 @@ def format_logs(log_list):
                 )
                 for expected_msg, actual_msg in zip(client["messages"], actual_logs):
                     expected_data, actual_data = expected_msg.pop("data"), actual_msg.pop("data")
+
                     if "failureIsRedacted" in expected_msg:
                         self.assertIn("failure", actual_data)
                         should_redact = expected_msg.pop("failureIsRedacted")

test/test_client.py

@@ -130,7 +130,7 @@ class ClientUnitTest(UnitTest):
     client: MongoClient
 
     def setUp(self) -> None:
-        self.client = self.rs_or_single_client(connect=True, serverSelectionTimeoutMS=100)
+        self.client = self.rs_or_single_client(connect=False, serverSelectionTimeoutMS=100)
 
     @pytest.fixture(autouse=True)
     def inject_fixtures(self, caplog):
@@ -254,7 +254,7 @@ def test_iteration(self):
     def test_get_default_database(self):
         c = self.rs_or_single_client(
             "mongodb://%s:%d/foo" % (client_context.host, client_context.port),
-            connect=True,
+            connect=False,
         )
         self.assertEqual(Database(c, "foo"), c.get_default_database())
         # Test that default doesn't override the URI value.
@@ -270,7 +270,7 @@ def test_get_default_database(self):
 
         c = self.rs_or_single_client(
             "mongodb://%s:%d/" % (client_context.host, client_context.port),
-            connect=True,
+            connect=False,
         )
         self.assertEqual(Database(c, "foo"), c.get_default_database("foo"))
 
@@ -288,13 +288,13 @@ def test_get_default_database_with_authsource(self):
             client_context.host,
             client_context.port,
         )
-        c = self.rs_or_single_client(uri, connect=True)
+        c = self.rs_or_single_client(uri, connect=False)
         self.assertEqual(Database(c, "foo"), c.get_default_database())
 
     def test_get_database_default(self):
         c = self.rs_or_single_client(
             "mongodb://%s:%d/foo" % (client_context.host, client_context.port),
-            connect=True,
+            connect=False,
         )
         self.assertEqual(Database(c, "foo"), c.get_database())
 
@@ -312,7 +312,7 @@ def test_get_database_default_with_authsource(self):
             client_context.host,
             client_context.port,
         )
-        c = self.rs_or_single_client(uri, connect=True)
+        c = self.rs_or_single_client(uri, connect=False)
         self.assertEqual(Database(c, "foo"), c.get_database())
 
     def test_primary_read_pref_with_tags(self):
@@ -792,7 +792,7 @@ def test_init_disconnected(self):
         self.assertIsInstance(c.is_primary, bool)
         c = self.rs_or_single_client(connect=False)
         self.assertIsInstance(c.is_mongos, bool)
-        c = self.rs_or_single_client(connect=True)
+        c = self.rs_or_single_client(connect=False)
         self.assertIsInstance(c.options.pool_options.max_pool_size, int)
         self.assertIsInstance(c.nodes, frozenset)
 
@@ -825,12 +825,12 @@ def test_init_disconnected_with_auth(self):
 
     def test_equality(self):
         seed = "{}:{}".format(*list(self.client._topology_settings.seeds)[0])
-        c = self.rs_or_single_client(seed, connect=True)
+        c = self.rs_or_single_client(seed, connect=False)
         self.assertEqual(client_context.client, c)
         # Explicitly test inequality
         self.assertFalse(client_context.client != c)
 
-        c = self.rs_or_single_client("invalid.com", connect=True)
+        c = self.rs_or_single_client("invalid.com", connect=False)
         self.assertNotEqual(client_context.client, c)
         self.assertTrue(client_context.client != c)
 
@@ -852,9 +852,9 @@ def test_equality(self):
 
     def test_hashable(self):
         seed = "{}:{}".format(*list(self.client._topology_settings.seeds)[0])
-        c = self.rs_or_single_client(seed, connect=True)
+        c = self.rs_or_single_client(seed, connect=False)
         self.assertIn(c, {client_context.client})
-        c = self.rs_or_single_client("invalid.com", connect=True)
+        c = self.rs_or_single_client("invalid.com", connect=False)
         self.assertNotIn(c, {client_context.client})
 
     def test_host_w_port(self):

test/unified_format.py

@@ -1341,6 +1341,7 @@ def format_logs(log_list):
                 )
                 for expected_msg, actual_msg in zip(client["messages"], actual_logs):
                     expected_data, actual_data = expected_msg.pop("data"), actual_msg.pop("data")
+
                     if "failureIsRedacted" in expected_msg:
                         self.assertIn("failure", actual_data)
                         should_redact = expected_msg.pop("failureIsRedacted")