From 17d2a12b4992267c58ac003f1b1bfa883eec3dfd Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Thu, 19 Mar 2026 10:05:14 -0400 Subject: [PATCH] PYTHON-5743 + PYTHON-5755 sync --- .../backpressure-connection-checkin.json | 14 +------------- .../backpressure-retry-loop.json | 8 ++++---- .../backpressure-retry-max-attempts.json | 6 +++--- test/client-backpressure/getMore-retried.json | 8 +++++--- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/test/client-backpressure/backpressure-connection-checkin.json b/test/client-backpressure/backpressure-connection-checkin.json index 307fc9fb53..340c87c014 100644 --- a/test/client-backpressure/backpressure-connection-checkin.json +++ b/test/client-backpressure/backpressure-connection-checkin.json @@ -32,7 +32,7 @@ "database": { "id": "database", "client": "client", - "databaseName": "retryable-writes-tests" + "databaseName": "backpressure-connection-checkin" } }, { @@ -43,18 +43,6 @@ } } ], - "initialData": [ - { - "collectionName": "coll", - "databaseName": "retryable-writes-tests", - "documents": [ - { - "_id": 1, - "x": 11 - } - ] - } - ], "tests": [ { "description": "overload error retry attempts return connections to the pool", diff --git a/test/client-backpressure/backpressure-retry-loop.json b/test/client-backpressure/backpressure-retry-loop.json index 0e8840f523..9121b21856 100644 --- a/test/client-backpressure/backpressure-retry-loop.json +++ b/test/client-backpressure/backpressure-retry-loop.json @@ -112,7 +112,7 @@ "database": { "id": "database_retryWrites_false", "client": "client_retryWrites_false", - "databaseName": "backpressure-db" + "databaseName": "retryable-writes-tests" } }, { @@ -711,7 +711,7 @@ ] }, { - "description": "database.aggregate retries using operation loop", + "description": "database.aggregate read retries using operation loop", "operations": [ { "name": "failPoint", @@ -1480,7 +1480,7 @@ ] }, { - "description": "collection.aggregate retries using operation loop", + "description": "collection.aggregate read retries using operation loop", "operations": [ { "name": "failPoint", @@ -4734,7 +4734,7 @@ ] }, { - "description": "collection.aggregate retries using operation loop", + "description": "collection.aggregate write retries using operation loop", "operations": [ { "name": "failPoint", diff --git a/test/client-backpressure/backpressure-retry-max-attempts.json b/test/client-backpressure/backpressure-retry-max-attempts.json index 1e6f46f076..ed2352ca83 100644 --- a/test/client-backpressure/backpressure-retry-max-attempts.json +++ b/test/client-backpressure/backpressure-retry-max-attempts.json @@ -496,7 +496,7 @@ ] }, { - "description": "database.aggregate retries at most maxAttempts=5 times", + "description": "database.aggregate read retries at most maxAttempts=5 times", "operations": [ { "name": "failPoint", @@ -1026,7 +1026,7 @@ ] }, { - "description": "collection.aggregate retries at most maxAttempts=5 times", + "description": "collection.aggregate read retries at most maxAttempts=5 times", "operations": [ { "name": "failPoint", @@ -3448,7 +3448,7 @@ ] }, { - "description": "collection.aggregate retries at most maxAttempts=5 times", + "description": "collection.aggregate write retries at most maxAttempts=5 times", "operations": [ { "name": "failPoint", diff --git a/test/client-backpressure/getMore-retried.json b/test/client-backpressure/getMore-retried.json index 70eff84612..5fd76be679 100644 --- a/test/client-backpressure/getMore-retried.json +++ b/test/client-backpressure/getMore-retried.json @@ -1,5 +1,5 @@ { - "description": "getMore-retries-backpressure", + "description": "getMore-retried-backpressure", "schemaVersion": "1.3", "runOnRequirements": [ { @@ -10,6 +10,7 @@ { "client": { "id": "client0", + "useMultipleMongoses": false, "observeEvents": [ "commandStartedEvent", "commandFailedEvent", @@ -19,7 +20,8 @@ }, { "client": { - "id": "failPointClient" + "id": "failPointClient", + "useMultipleMongoses": false } }, { @@ -83,6 +85,7 @@ }, { "name": "find", + "object": "coll", "arguments": { "batchSize": 2, "filter": {}, @@ -90,7 +93,6 @@ "a": 1 } }, - "object": "coll", "expectResult": [ { "a": 1