mongodb/mongo-python-driver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PYTHON-5167 Properly cleanup test SocketGetter tasks (#2176)

Browse Source
This commit is contained in:
Shane Harvey 2025-03-04 11:25:15 -08:00 committed by GitHub
parent 3f5d6c1539
commit 9edfc626ed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/asynchronous/test_pooling.py
View File

@ -123,9 +123,12 @@ class SocketGetter(MongoTask):
self.state = "connection"
def __del__(self):
async def release_conn(self):
if self.sock:
self.sock.close_conn(None)
await self.sock.unpin()
self.sock = None
return True
return False
async def run_cases(client, cases):
@ -352,6 +355,10 @@ class TestPooling(_TestPoolingBase):
self.assertEqual(t.state, "connection")
self.assertEqual(t.sock, s1)
# Cleanup
await t.release_conn()
await t.join()
await pool.close()
async def test_checkout_more_than_max_pool_size(self):
pool = await self.create_pool(max_pool_size=2)
@ -364,16 +371,26 @@ class TestPooling(_TestPoolingBase):
socks.append(sock)
tasks = []
for _ in range(30):
for _ in range(10):
t = SocketGetter(self.c, pool)
await t.start()
tasks.append(t)
await asyncio.sleep(1)
for t in tasks:
self.assertEqual(t.state, "get_socket")
# Cleanup
for socket_info in socks:
socket_info.close_conn(None)
await socket_info.unpin()
while tasks:
to_remove = []
for t in tasks:
if await t.release_conn():
to_remove.append(t)
await t.join()
for t in to_remove:
tasks.remove(t)
await asyncio.sleep(0.05)
await pool.close()
async def test_maxConnecting(self):
client = await self.async_rs_or_single_client()

27
test/test_pooling.py
View File

@ -123,9 +123,12 @@ class SocketGetter(MongoTask):
self.state = "connection"
def __del__(self):
def release_conn(self):
if self.sock:
self.sock.close_conn(None)
self.sock.unpin()
self.sock = None
return True
return False
def run_cases(client, cases):
@ -352,6 +355,10 @@ class TestPooling(_TestPoolingBase):
self.assertEqual(t.state, "connection")
self.assertEqual(t.sock, s1)
# Cleanup
t.release_conn()
t.join()
pool.close()
def test_checkout_more_than_max_pool_size(self):
pool = self.create_pool(max_pool_size=2)
@ -364,16 +371,26 @@ class TestPooling(_TestPoolingBase):
socks.append(sock)
tasks = []
for _ in range(30):
for _ in range(10):
t = SocketGetter(self.c, pool)
t.start()
tasks.append(t)
time.sleep(1)
for t in tasks:
self.assertEqual(t.state, "get_socket")
# Cleanup
for socket_info in socks:
socket_info.close_conn(None)
socket_info.unpin()
while tasks:
to_remove = []
for t in tasks:
if t.release_conn():
to_remove.append(t)
t.join()
for t in to_remove:
tasks.remove(t)
time.sleep(0.05)
pool.close()
def test_maxConnecting(self):
client = self.rs_or_single_client()