fix tests

Author: blink1073

pymongo/asynchronous/pool.py

@@ -1355,8 +1355,9 @@ async def _get_conn(
                             timeout = 0.01
                         if not await _async_cond_wait(self._max_connecting_cond, timeout):
                             # Check whether we should continue to wait for the backoff condition.
-                            if self._backoff and (deadline is None or deadline < time.monotonic()):
-                                if self._backoff_connection_time > time.monotonic():
+                            curr_time = time.monotonic()
+                            if self._backoff and (deadline is None or curr_time < deadline):
+                                if self._backoff_connection_time > curr_time:
                                     continue
                                 break
                             # Timed out, notify the next thread to ensure a

pymongo/synchronous/pool.py

@@ -1353,8 +1353,9 @@ def _get_conn(
                             timeout = 0.01
                         if not _cond_wait(self._max_connecting_cond, timeout):
                             # Check whether we should continue to wait for the backoff condition.
-                            if self._backoff and (deadline is None or deadline < time.monotonic()):
-                                if self._backoff_connection_time > time.monotonic():
+                            curr_time = time.monotonic()
+                            if self._backoff and (deadline is None or curr_time < deadline):
+                                if self._backoff_connection_time > curr_time:
                                     continue
                                 break
                             # Timed out, notify the next thread to ensure a

test/asynchronous/test_pooling.py

@@ -517,7 +517,7 @@ async def test_connection_timeout_message(self):
     async def test_pool_check_backoff(self):
         # Test that Pool recovers from two connection failures in a row.
         # This exercises code at the end of Pool._check().
-        cx_pool = await self.create_pool(max_pool_size=1, connect_timeout=1, wait_queue_timeout=1)
+        cx_pool = await self.create_pool(max_pool_size=1, connect_timeout=1, wait_queue_timeout=10)
         self.addAsyncCleanup(cx_pool.close)
 
         async with cx_pool.checkout() as conn:
@@ -526,7 +526,7 @@ async def test_pool_check_backoff(self):
             await conn.conn.close()
 
         # Enable backoff.
-        cx_pool.backoff()
+        await cx_pool.backoff()
 
         # Swap pool's address with a bad one.
         address, cx_pool.address = cx_pool.address, ("foo.com", 1234)

test/discovery_and_monitoring/unified/backoff-heartbeat-failure.json

@@ -50,7 +50,6 @@
                   "observeEvents": [
                     "commandStartedEvent",
                     "poolBackoffEvent",
-                    "poolReadyEvent",
                     "poolClearedEvent",
                     "serverHeartbeatFailedEvent",
                     "serverHeartbeatSucceededEvent"
@@ -143,9 +142,6 @@
           "client": "client",
           "eventType": "cmap",
           "events": [
-            {
-              "poolReadyEvent": {}
-            },
             {
               "poolBackoffEvent": {}
             },

test/discovery_and_monitoring/unified/backoff-heartbeat-success.json

@@ -50,7 +50,6 @@
                   "observeEvents": [
                     "commandStartedEvent",
                     "poolBackoffEvent",
-                    "poolReadyEvent",
                     "poolClearedEvent",
                     "serverHeartbeatFailedEvent",
                     "serverHeartbeatSucceededEvent"
@@ -154,9 +153,6 @@
           "client": "client",
           "eventType": "cmap",
           "events": [
-            {
-              "poolReadyEvent": {}
-            },
             {
               "poolBackoffEvent": {}
             },

test/discovery_and_monitoring/unified/backoff-network-error-fail.json

@@ -202,9 +202,7 @@
             "client": "setupClient",
             "failPoint": {
               "configureFailPoint": "failCommand",
-              "mode": {
-                "times": 6
-              },
+              "mode": "always",
               "data": {
                 "failCommands": [
                   "isMaster",
@@ -244,6 +242,17 @@
             "count": 5
           }
         },
+        {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "setupClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": "off"
+            }
+          }
+        },
         {
           "name": "failPoint",
           "object": "testRunner",

test/test_pooling.py

@@ -515,7 +515,7 @@ def test_connection_timeout_message(self):
     def test_pool_check_backoff(self):
         # Test that Pool recovers from two connection failures in a row.
         # This exercises code at the end of Pool._check().
-        cx_pool = self.create_pool(max_pool_size=1, connect_timeout=1, wait_queue_timeout=1)
+        cx_pool = self.create_pool(max_pool_size=1, connect_timeout=1, wait_queue_timeout=10)
         self.addCleanup(cx_pool.close)
 
         with cx_pool.checkout() as conn: