fix teardown

Author: blink1073

test/__init__.py

@@ -32,6 +32,7 @@
 import warnings
 from asyncio import iscoroutinefunction
 
+from pymongo.errors import AutoReconnect
 from pymongo.synchronous.uri_parser import parse_uri
 
 try:
@@ -1237,12 +1238,17 @@ def teardown():
     c = client_context.client
     if c:
         if not client_context.is_data_lake:
-            c.drop_database("pymongo-pooling-tests")
-            c.drop_database("pymongo_test")
-            c.drop_database("pymongo_test1")
-            c.drop_database("pymongo_test2")
-            c.drop_database("pymongo_test_mike")
-            c.drop_database("pymongo_test_bernie")
+            try:
+                c.drop_database("pymongo-pooling-tests")
+                c.drop_database("pymongo_test")
+                c.drop_database("pymongo_test1")
+                c.drop_database("pymongo_test2")
+                c.drop_database("pymongo_test_mike")
+                c.drop_database("pymongo_test_bernie")
+            except AutoReconnect:
+                # PYTHON-4982
+                if sys.implementation.name.lower() != "pypy":
+                    raise
         c.close()
     print_running_clients()
 

test/asynchronous/__init__.py

@@ -33,6 +33,7 @@
 from asyncio import iscoroutinefunction
 
 from pymongo.asynchronous.uri_parser import parse_uri
+from pymongo.errors import AutoReconnect
 
 try:
     import ipaddress
@@ -1253,12 +1254,17 @@ async def async_teardown():
     c = async_client_context.client
     if c:
         if not async_client_context.is_data_lake:
-            await c.drop_database("pymongo-pooling-tests")
-            await c.drop_database("pymongo_test")
-            await c.drop_database("pymongo_test1")
-            await c.drop_database("pymongo_test2")
-            await c.drop_database("pymongo_test_mike")
-            await c.drop_database("pymongo_test_bernie")
+            try:
+                await c.drop_database("pymongo-pooling-tests")
+                await c.drop_database("pymongo_test")
+                await c.drop_database("pymongo_test1")
+                await c.drop_database("pymongo_test2")
+                await c.drop_database("pymongo_test_mike")
+                await c.drop_database("pymongo_test_bernie")
+            except AutoReconnect:
+                # PYTHON-4982
+                if sys.implementation.name.lower() != "pypy":
+                    raise
         await c.close()
     print_running_clients()
 

test/asynchronous/test_encryption.py

@@ -3482,8 +3482,6 @@ class TestNoSessionsSupport(AsyncEncryptionIntegrationTest):
     MONGOCRYPTD_PORT = 27020
 
     async def asyncSetUp(self) -> None:
-        if sys.implementation.name.lower() == "pypy":
-            return
         await super().asyncSetUp()
         start_mongocryptd(self.MONGOCRYPTD_PORT)
 
@@ -3496,8 +3494,6 @@ async def asyncSetUp(self) -> None:
         self.assertNotIn("logicalSessionTimeoutMinutes", hello)
 
     async def test_implicit_session_ignored_when_unsupported(self):
-        if sys.implementation.name.lower() == "pypy":
-            raise self.skipTest("PYTHON-4982 Skipping test on pypy")
         self.listener.reset()
         with self.assertRaises(OperationFailure):
             await self.mongocryptd_client.db.test.find_one()
@@ -3512,8 +3508,6 @@ async def test_implicit_session_ignored_when_unsupported(self):
         await self.mongocryptd_client.close()
 
     async def test_explicit_session_errors_when_unsupported(self):
-        if sys.implementation.name.lower() == "pypy":
-            raise self.skipTest("PYTHON-4982 Skipping test on pypy")
         self.listener.reset()
         async with self.mongocryptd_client.start_session() as s:
             with self.assertRaisesRegex(

test/test_encryption.py

@@ -3464,8 +3464,6 @@ class TestNoSessionsSupport(EncryptionIntegrationTest):
     MONGOCRYPTD_PORT = 27020
 
     def setUp(self) -> None:
-        if sys.implementation.name.lower() == "pypy":
-            return
         super().setUp()
         start_mongocryptd(self.MONGOCRYPTD_PORT)
 
@@ -3478,8 +3476,6 @@ def setUp(self) -> None:
         self.assertNotIn("logicalSessionTimeoutMinutes", hello)
 
     def test_implicit_session_ignored_when_unsupported(self):
-        if sys.implementation.name.lower() == "pypy":
-            raise self.skipTest("PYTHON-4982 Skipping test on pypy")
         self.listener.reset()
         with self.assertRaises(OperationFailure):
             self.mongocryptd_client.db.test.find_one()
@@ -3494,8 +3490,6 @@ def test_implicit_session_ignored_when_unsupported(self):
         self.mongocryptd_client.close()
 
     def test_explicit_session_errors_when_unsupported(self):
-        if sys.implementation.name.lower() == "pypy":
-            raise self.skipTest("PYTHON-4982 Skipping test on pypy")
         self.listener.reset()
         with self.mongocryptd_client.start_session() as s:
             with self.assertRaisesRegex(