PYTHON-2462 Fix test_threads.TestThreads.test_client_disconnect

test_client_disconnect (test.test_threads.TestThreads) ... Exception in thread Thread-1:
Traceback (most recent call last):
  File "/Library/Frameworks/Python.framework/Versions/3.7/lib/python3.7/threading.py", line 926, in _bootstrap_inner
    self.run()
  File "/Users/shane/git/mongo-python-driver/test/test_threads.py", line 61, in run
    for document in self.collection.find():
  File "/Users/shane/git/mongo-python-driver/pymongo/cursor.py", line 1207, in next
    if len(self.__data) or self._refresh():
  File "/Users/shane/git/mongo-python-driver/pymongo/cursor.py", line 1144, in _refresh
    self.__send_message(g)
  File "/Users/shane/git/mongo-python-driver/pymongo/cursor.py", line 1001, in __send_message
    address=self.__address)
  File "/Users/shane/git/mongo-python-driver/pymongo/mongo_client.py", line 1372, in _run_operation_with_response
    exhaust=exhaust)
  File "/Users/shane/git/mongo-python-driver/pymongo/mongo_client.py", line 1465, in _retryable_read
    exhaust=exhaust) as (sock_info,
  File "/Library/Frameworks/Python.framework/Versions/3.7/lib/python3.7/contextlib.py", line 112, in __enter__
    return next(self.gen)
  File "/Users/shane/git/mongo-python-driver/pymongo/mongo_client.py", line 1309, in _slaveok_for_server
    with self._get_socket(server, session, exhaust=exhaust) as sock_info:
  File "/Library/Frameworks/Python.framework/Versions/3.7/lib/python3.7/contextlib.py", line 112, in __enter__
    return next(self.gen)
  File "/Users/shane/git/mongo-python-driver/pymongo/mongo_client.py", line 1247, in _get_socket
    self.__all_credentials, checkout=exhaust) as sock_info:
  File "/Library/Frameworks/Python.framework/Versions/3.7/lib/python3.7/contextlib.py", line 112, in __enter__
    return next(self.gen)
  File "/Users/shane/git/mongo-python-driver/pymongo/pool.py", line 1320, in get_socket
    sock_info = self._get_socket(all_credentials)
  File "/Users/shane/git/mongo-python-driver/pymongo/pool.py", line 1370, in _get_socket
    self._raise_if_not_ready()
  File "/Users/shane/git/mongo-python-driver/pymongo/pool.py", line 1342, in _raise_if_not_ready
    self.address, AutoReconnect('connection pool paused'))
  File "/Users/shane/git/mongo-python-driver/pymongo/pool.py", line 288, in _raise_connection_failure
    raise AutoReconnect(msg)
pymongo.errors.AutoReconnect: localhost:27017: connection pool paused

FAIL

======================================================================
FAIL: test_client_disconnect (test.test_threads.TestThreads)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/Users/shane/git/mongo-python-driver/test/test_threads.py", line 203, in test_client_disconnect
    self.assertTrue(t.passed)
AssertionError: False is not true

Author: ShaneHarvey

pymongo/pool.py

@@ -1146,12 +1146,12 @@ def ready(self):
     def closed(self):
         return self.state == CLOSED
 
-    def _reset(self, close):
+    def _reset(self, close, pause=True):
         old_state = self.state
         with self.size_cond:
             if self.closed:
                 return
-            if self.opts.pause_enabled:
+            if self.opts.pause_enabled and pause:
                 old_state, self.state = self.state, PAUSED
             self.generation += 1
             newpid = os.getpid()
@@ -1193,6 +1193,9 @@ def update_is_writable(self, is_writable):
     def reset(self):
         self._reset(close=False)
 
+    def reset_without_pause(self):
+        self._reset(close=False, pause=False)
+
     def close(self):
         self._reset(close=True)
 

pymongo/server.py

@@ -61,7 +61,7 @@ def close(self):
             self._events.put((self._listener.publish_server_closed,
                               (self._description.address, self._topology_id)))
         self._monitor.close()
-        self._pool.reset()
+        self._pool.reset_without_pause()
 
     def request_check(self):
         """Check the server's state soon."""

test/cmap/pool-clear-paused.json

@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "style": "unit",
+  "description": "clearing a paused pool emits no events",
+  "operations": [
+    {
+      "name": "clear"
+    },
+    {
+      "name": "ready"
+    },
+    {
+      "name": "clear"
+    },
+    {
+      "name": "clear"
+    }
+  ],
+  "events": [
+    {
+      "type": "ConnectionPoolReady",
+      "address": 42
+    },
+    {
+      "type": "ConnectionPoolCleared",
+      "address": 42
+    }
+  ],
+  "ignore": [
+    "ConnectionPoolCreated"
+  ]
+}

test/test_cmap.py

@@ -39,7 +39,7 @@
                                 PoolClearedEvent,
                                 PoolClosedEvent)
 from pymongo.read_preferences import ReadPreference
-from pymongo.pool import _PoolClosedError
+from pymongo.pool import _PoolClosedError, READY
 
 from test import (client_knobs,
                   IntegrationTest,
@@ -412,6 +412,20 @@ def test_events_repr(self):
         self.assertRepr(PoolClearedEvent(host))
         self.assertRepr(PoolClosedEvent(host))
 
+    def test_close_leaves_pool_unpaused(self):
+        # Needed until we implement PYTHON-2463. This test is related to
+        # test_threads.TestThreads.test_client_disconnect
+        listener = CMAPListener()
+        client = single_client(event_listeners=[listener])
+        client.admin.command('ping')
+        pool = get_pool(client)
+        client.close()
+        self.assertEqual(1, listener.event_count(PoolClearedEvent))
+        self.assertEqual(READY, pool.state)
+        # Checking out a connection should succeed
+        with pool.get_socket({}):
+            pass
+
 
 def create_test(scenario_def, test, name):
     def run_scenario(self):

test/utils.py

@@ -258,6 +258,9 @@ def ready(self):
     def reset(self):
         self._reset()
 
+    def reset_without_pause(self):
+        self._reset()
+
     def close(self):
         self._reset()