From 508794cf7fbf685cbb2143f8383f9a14729c2e65 Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Thu, 27 Aug 2026 09:55:19 -0400 Subject: [PATCH 1/3] PYTHON-5290 - Align client bulkwrite prose test with spec --- test/asynchronous/test_client_bulk_write.py | 2 +- test/test_client_bulk_write.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/asynchronous/test_client_bulk_write.py b/test/asynchronous/test_client_bulk_write.py index 0a17d25e93..78cc1f617e 100644 --- a/test/asynchronous/test_client_bulk_write.py +++ b/test/asynchronous/test_client_bulk_write.py @@ -634,7 +634,7 @@ async def asyncSetUp(self): @async_client_context.require_version_min(8, 0, 0, -24) @async_client_context.require_failCommand_fail_point - @flaky(reason="PYTHON-5290", max_runs=3, affects_cpython_linux=True) + @async_client_context.require_standalone async def test_timeout_in_multi_batch_bulk_write(self): if sys.platform != "linux" and "CI" in os.environ: self.skipTest("PYTHON-3522 CSOT test runs too slow on Windows and MacOS") diff --git a/test/test_client_bulk_write.py b/test/test_client_bulk_write.py index 4cf799a20b..ceba4fa676 100644 --- a/test/test_client_bulk_write.py +++ b/test/test_client_bulk_write.py @@ -630,7 +630,7 @@ def setUp(self): @client_context.require_version_min(8, 0, 0, -24) @client_context.require_failCommand_fail_point - @flaky(reason="PYTHON-5290", max_runs=3, affects_cpython_linux=True) + @client_context.require_standalone def test_timeout_in_multi_batch_bulk_write(self): if sys.platform != "linux" and "CI" in os.environ: self.skipTest("PYTHON-3522 CSOT test runs too slow on Windows and MacOS") From 1dcea304c99880d123037c7f8824bd9dad237b11 Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Thu, 27 Aug 2026 10:09:49 -0400 Subject: [PATCH 2/3] Cleanup --- test/asynchronous/test_client_bulk_write.py | 2 -- test/test_client_bulk_write.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/test/asynchronous/test_client_bulk_write.py b/test/asynchronous/test_client_bulk_write.py index 78cc1f617e..7823c1cb4b 100644 --- a/test/asynchronous/test_client_bulk_write.py +++ b/test/asynchronous/test_client_bulk_write.py @@ -29,7 +29,6 @@ from pymongo.errors import ( ClientBulkWriteException, DocumentTooLarge, - InvalidOperation, NetworkTimeout, ) from pymongo.operations import * @@ -39,7 +38,6 @@ async_client_context, unittest, ) -from test.asynchronous.utils import flaky from test.utils_shared import ( OvertCommandListener, ) diff --git a/test/test_client_bulk_write.py b/test/test_client_bulk_write.py index ceba4fa676..3e873efd15 100644 --- a/test/test_client_bulk_write.py +++ b/test/test_client_bulk_write.py @@ -28,7 +28,6 @@ from pymongo.errors import ( ClientBulkWriteException, DocumentTooLarge, - InvalidOperation, NetworkTimeout, ) from pymongo.operations import * @@ -39,7 +38,6 @@ client_context, unittest, ) -from test.utils import flaky from test.utils_shared import ( OvertCommandListener, ) From b1b33277501d29bccb72df1bc91e2b4e3b805bc2 Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Fri, 28 Aug 2026 14:05:45 -0400 Subject: [PATCH 3/3] Remove * import --- test/asynchronous/test_client_bulk_write.py | 4 +++- test/test_client_bulk_write.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test/asynchronous/test_client_bulk_write.py b/test/asynchronous/test_client_bulk_write.py index 7823c1cb4b..85236a2346 100644 --- a/test/asynchronous/test_client_bulk_write.py +++ b/test/asynchronous/test_client_bulk_write.py @@ -19,6 +19,8 @@ import os import sys +from pymongo.operations import InsertOne, ReplaceOne, UpdateOne + sys.path[0:0] = [""] from unittest.mock import patch @@ -29,9 +31,9 @@ from pymongo.errors import ( ClientBulkWriteException, DocumentTooLarge, + InvalidOperation, NetworkTimeout, ) -from pymongo.operations import * from pymongo.write_concern import WriteConcern from test.asynchronous import ( AsyncIntegrationTest, diff --git a/test/test_client_bulk_write.py b/test/test_client_bulk_write.py index 3e873efd15..a7bf8ee777 100644 --- a/test/test_client_bulk_write.py +++ b/test/test_client_bulk_write.py @@ -19,6 +19,8 @@ import os import sys +from pymongo.operations import InsertOne, ReplaceOne, UpdateOne + sys.path[0:0] = [""] from unittest.mock import patch @@ -28,9 +30,9 @@ from pymongo.errors import ( ClientBulkWriteException, DocumentTooLarge, + InvalidOperation, NetworkTimeout, ) -from pymongo.operations import * from pymongo.synchronous.client_bulk import _ClientBulk from pymongo.write_concern import WriteConcern from test import (