diff --git a/.evergreen/remove-unimplemented-tests.sh b/.evergreen/remove-unimplemented-tests.sh index d81713794d..794319679b 100755 --- a/.evergreen/remove-unimplemented-tests.sh +++ b/.evergreen/remove-unimplemented-tests.sh @@ -7,7 +7,6 @@ rm $PYMONGO/test/discovery_and_monitoring/unified/pool-clear-application-error.j rm $PYMONGO/test/discovery_and_monitoring/unified/pool-clear-checkout-error.json # PYTHON-4918 rm $PYMONGO/test/discovery_and_monitoring/unified/pool-clear-min-pool-size-error.json # PYTHON-4918 rm $PYMONGO/test/client-side-encryption/spec/unified/client-bulkWrite-qe.json # PYTHON-4929 -rm $PYMONGO/test/sessions/snapshot-sessions.json # PYTHON-5559 # Python doesn't implement DRIVERS-3064 rm $PYMONGO/test/collection_management/listCollections-rawdata.json diff --git a/.evergreen/spec-patch/PYTHON-5529.patch b/.evergreen/spec-patch/PYTHON-5529.patch deleted file mode 100644 index a97602e055..0000000000 --- a/.evergreen/spec-patch/PYTHON-5529.patch +++ /dev/null @@ -1,587 +0,0 @@ -diff --git a/test/csot/command-execution.json b/test/csot/command-execution.json -index aa9c3eb2..212cd410 100644 ---- a/test/csot/command-execution.json -+++ b/test/csot/command-execution.json -@@ -1,6 +1,6 @@ - { - "description": "timeoutMS behaves correctly during command execution", -- "schemaVersion": "1.9", -+ "schemaVersion": "1.26", - "runOnRequirements": [ - { - "minServerVersion": "4.4.7", -@@ -69,8 +69,10 @@ - "appName": "reduceMaxTimeMSTest", - "w": 1, - "timeoutMS": 500, -- "heartbeatFrequencyMS": 500 -+ "heartbeatFrequencyMS": 500, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "observeEvents": [ - "commandStartedEvent" - ] -@@ -185,8 +187,10 @@ - "appName": "rttTooHighTest", - "w": 1, - "timeoutMS": 10, -- "heartbeatFrequencyMS": 500 -+ "heartbeatFrequencyMS": 500, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "observeEvents": [ - "commandStartedEvent" - ] -@@ -316,8 +320,10 @@ - "appName": "reduceMaxTimeMSTest", - "w": 1, - "timeoutMS": 90, -- "heartbeatFrequencyMS": 100000 -+ "heartbeatFrequencyMS": 100000, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "observeEvents": [ - "commandStartedEvent" - ] -diff --git a/test/csot/convenient-transactions.json b/test/csot/convenient-transactions.json -index 3868b302..f9d03429 100644 ---- a/test/csot/convenient-transactions.json -+++ b/test/csot/convenient-transactions.json -@@ -1,6 +1,6 @@ - { - "description": "timeoutMS behaves correctly for the withTransaction API", -- "schemaVersion": "1.9", -+ "schemaVersion": "1.26", - "runOnRequirements": [ - { - "minServerVersion": "4.4", -@@ -21,8 +21,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 500 -+ "timeoutMS": 500, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -diff --git a/test/csot/error-transformations.json b/test/csot/error-transformations.json -index 4889e395..89be49f0 100644 ---- a/test/csot/error-transformations.json -+++ b/test/csot/error-transformations.json -@@ -1,6 +1,6 @@ - { - "description": "MaxTimeMSExpired server errors are transformed into a custom timeout error", -- "schemaVersion": "1.9", -+ "schemaVersion": "1.26", - "runOnRequirements": [ - { - "minServerVersion": "4.0", -@@ -26,8 +26,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -diff --git a/test/csot/global-timeoutMS.json b/test/csot/global-timeoutMS.json -index f1edbe68..9d8046d1 100644 ---- a/test/csot/global-timeoutMS.json -+++ b/test/csot/global-timeoutMS.json -@@ -1,6 +1,6 @@ - { - "description": "timeoutMS can be configured on a MongoClient", -- "schemaVersion": "1.9", -+ "schemaVersion": "1.26", - "runOnRequirements": [ - { - "minServerVersion": "4.4", -@@ -38,8 +38,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -217,8 +219,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -390,8 +394,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -569,8 +575,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -762,8 +770,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -941,8 +951,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -1120,8 +1132,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -1305,8 +1319,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -1484,8 +1500,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -1663,8 +1681,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -1842,8 +1862,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -2021,8 +2043,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -2194,8 +2218,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -2375,8 +2401,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -2554,8 +2582,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -2733,8 +2763,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -2906,8 +2938,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -3079,8 +3113,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -3258,8 +3294,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -3441,8 +3479,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -3628,8 +3668,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -3807,8 +3849,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -3986,8 +4030,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -4171,8 +4217,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -4360,8 +4408,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -4549,8 +4599,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -4728,8 +4780,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -4913,8 +4967,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -5102,8 +5158,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -5297,8 +5355,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -5482,8 +5542,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -@@ -5677,8 +5739,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 250 -+ "timeoutMS": 250, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -diff --git a/test/csot/non-tailable-cursors.json b/test/csot/non-tailable-cursors.json -index 291c6e72..58c59cb3 100644 ---- a/test/csot/non-tailable-cursors.json -+++ b/test/csot/non-tailable-cursors.json -@@ -1,6 +1,6 @@ - { - "description": "timeoutMS behaves correctly for non-tailable cursors", -- "schemaVersion": "1.9", -+ "schemaVersion": "1.26", - "runOnRequirements": [ - { - "minServerVersion": "4.4" -@@ -17,8 +17,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 200 -+ "timeoutMS": 200, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -diff --git a/test/csot/retryability-timeoutMS.json b/test/csot/retryability-timeoutMS.json -index 9daad260..5a0c9f36 100644 ---- a/test/csot/retryability-timeoutMS.json -+++ b/test/csot/retryability-timeoutMS.json -@@ -1,6 +1,6 @@ - { - "description": "timeoutMS behaves correctly for retryable operations", -- "schemaVersion": "1.9", -+ "schemaVersion": "1.26", - "runOnRequirements": [ - { - "minServerVersion": "4.0", -@@ -26,8 +26,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 100 -+ "timeoutMS": 100, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent" -diff --git a/test/csot/runCursorCommand.json b/test/csot/runCursorCommand.json -index 36f774fb..e5182e33 100644 ---- a/test/csot/runCursorCommand.json -+++ b/test/csot/runCursorCommand.json -@@ -1,6 +1,6 @@ - { - "description": "runCursorCommand", -- "schemaVersion": "1.9", -+ "schemaVersion": "1.26", - "runOnRequirements": [ - { - "minServerVersion": "4.4" -@@ -16,6 +16,10 @@ - { - "client": { - "id": "commandClient", -+ "uriOptions": { -+ "minPoolSize": 1 -+ }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent", -diff --git a/test/csot/sessions-inherit-timeoutMS.json b/test/csot/sessions-inherit-timeoutMS.json -index 13ea91c7..dbf163e4 100644 ---- a/test/csot/sessions-inherit-timeoutMS.json -+++ b/test/csot/sessions-inherit-timeoutMS.json -@@ -1,6 +1,6 @@ - { - "description": "sessions inherit timeoutMS from their parent MongoClient", -- "schemaVersion": "1.9", -+ "schemaVersion": "1.26", - "runOnRequirements": [ - { - "minServerVersion": "4.4", -@@ -21,8 +21,10 @@ - "client": { - "id": "client", - "uriOptions": { -- "timeoutMS": 500 -+ "timeoutMS": 500, -+ "minPoolSize": 1 - }, -+ "awaitMinPoolSizeMS": 10000, - "useMultipleMongoses": false, - "observeEvents": [ - "commandStartedEvent",