From 198a7030eb6cd0aed2d32ab616e73fc015a01bf9 Mon Sep 17 00:00:00 2001 From: Shane Harvey Date: Mon, 14 Nov 2022 14:38:18 -0800 Subject: [PATCH 1/3] PYTHON-3500 Properly skip createChangeStream tests on serverless --- .../unified/handshakeError.json | 32 ++++++++++++++++++- .../unified/handshakeError.json | 2 +- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/test/retryable_reads/unified/handshakeError.json b/test/retryable_reads/unified/handshakeError.json index 58bbce66a8..2cd5030669 100644 --- a/test/retryable_reads/unified/handshakeError.json +++ b/test/retryable_reads/unified/handshakeError.json @@ -1,6 +1,6 @@ { "description": "retryable reads handshake failures", - "schemaVersion": "1.3", + "schemaVersion": "1.4", "runOnRequirements": [ { "minServerVersion": "4.2", @@ -429,6 +429,11 @@ }, { "description": "createChangeStream succeeds after retryable handshake network error", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", @@ -523,6 +528,11 @@ }, { "description": "createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", @@ -1189,6 +1199,11 @@ }, { "description": "createChangeStream succeeds after retryable handshake network error", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", @@ -1283,6 +1298,11 @@ }, { "description": "createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", @@ -2849,6 +2869,11 @@ }, { "description": "createChangeStream succeeds after retryable handshake network error", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", @@ -2943,6 +2968,11 @@ }, { "description": "createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", diff --git a/test/retryable_writes/unified/handshakeError.json b/test/retryable_writes/unified/handshakeError.json index e07e5412b2..7b69451fe8 100644 --- a/test/retryable_writes/unified/handshakeError.json +++ b/test/retryable_writes/unified/handshakeError.json @@ -1,6 +1,6 @@ { "description": "retryable writes handshake failures", - "schemaVersion": "1.3", + "schemaVersion": "1.4", "runOnRequirements": [ { "minServerVersion": "4.2", From d05475167af89fc5dc51013172494de73182bf2a Mon Sep 17 00:00:00 2001 From: Shane Harvey Date: Tue, 15 Nov 2022 10:46:37 -0800 Subject: [PATCH 2/3] PYTHON-3500 Resync to fix test names --- .../unified/handshakeError.json | 64 +++++++++---------- .../unified/handshakeError.json | 38 +++++------ 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/test/retryable_reads/unified/handshakeError.json b/test/retryable_reads/unified/handshakeError.json index 2cd5030669..f5c43b45fe 100644 --- a/test/retryable_reads/unified/handshakeError.json +++ b/test/retryable_reads/unified/handshakeError.json @@ -62,7 +62,7 @@ ], "tests": [ { - "description": "listDatabases succeeds after retryable handshake network error", + "description": "client.listDatabases succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -155,7 +155,7 @@ ] }, { - "description": "listDatabases succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "client.listDatabases succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -248,7 +248,7 @@ ] }, { - "description": "listDatabaseNames succeeds after retryable handshake network error", + "description": "client.listDatabaseNames succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -338,7 +338,7 @@ ] }, { - "description": "listDatabaseNames succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "client.listDatabaseNames succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -428,7 +428,7 @@ ] }, { - "description": "createChangeStream succeeds after retryable handshake network error", + "description": "client.createChangeStream succeeds after retryable handshake network error", "runOnRequirements": [ { "serverless": "forbid" @@ -527,7 +527,7 @@ ] }, { - "description": "createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "client.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)", "runOnRequirements": [ { "serverless": "forbid" @@ -626,7 +626,7 @@ ] }, { - "description": "aggregate succeeds after retryable handshake network error", + "description": "database.aggregate succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -726,7 +726,7 @@ ] }, { - "description": "aggregate succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "database.aggregate succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -826,7 +826,7 @@ ] }, { - "description": "listCollections succeeds after retryable handshake network error", + "description": "database.listCollections succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -919,7 +919,7 @@ ] }, { - "description": "listCollections succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "database.listCollections succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -1012,7 +1012,7 @@ ] }, { - "description": "listCollectionNames succeeds after retryable handshake network error", + "description": "database.listCollectionNames succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -1105,7 +1105,7 @@ ] }, { - "description": "listCollectionNames succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "database.listCollectionNames succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -1198,7 +1198,7 @@ ] }, { - "description": "createChangeStream succeeds after retryable handshake network error", + "description": "database.createChangeStream succeeds after retryable handshake network error", "runOnRequirements": [ { "serverless": "forbid" @@ -1297,7 +1297,7 @@ ] }, { - "description": "createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "database.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)", "runOnRequirements": [ { "serverless": "forbid" @@ -1396,7 +1396,7 @@ ] }, { - "description": "aggregate succeeds after retryable handshake network error", + "description": "collection.aggregate succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -1489,7 +1489,7 @@ ] }, { - "description": "aggregate succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.aggregate succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -1582,7 +1582,7 @@ ] }, { - "description": "countDocuments succeeds after retryable handshake network error", + "description": "collection.countDocuments succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -1675,7 +1675,7 @@ ] }, { - "description": "countDocuments succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.countDocuments succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -1768,7 +1768,7 @@ ] }, { - "description": "estimatedDocumentCount succeeds after retryable handshake network error", + "description": "collection.estimatedDocumentCount succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -1858,7 +1858,7 @@ ] }, { - "description": "estimatedDocumentCount succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.estimatedDocumentCount succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -1948,7 +1948,7 @@ ] }, { - "description": "distinct succeeds after retryable handshake network error", + "description": "collection.distinct succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -2042,7 +2042,7 @@ ] }, { - "description": "distinct succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.distinct succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -2136,7 +2136,7 @@ ] }, { - "description": "find succeeds after retryable handshake network error", + "description": "collection.find succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -2229,7 +2229,7 @@ ] }, { - "description": "find succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.find succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -2322,7 +2322,7 @@ ] }, { - "description": "findOne succeeds after retryable handshake network error", + "description": "collection.findOne succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -2415,7 +2415,7 @@ ] }, { - "description": "findOne succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.findOne succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -2508,7 +2508,7 @@ ] }, { - "description": "listIndexes succeeds after retryable handshake network error", + "description": "collection.listIndexes succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -2598,7 +2598,7 @@ ] }, { - "description": "listIndexes succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.listIndexes succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -2688,7 +2688,7 @@ ] }, { - "description": "listIndexNames succeeds after retryable handshake network error", + "description": "collection.listIndexNames succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -2778,7 +2778,7 @@ ] }, { - "description": "listIndexNames succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.listIndexNames succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -2868,7 +2868,7 @@ ] }, { - "description": "createChangeStream succeeds after retryable handshake network error", + "description": "collection.createChangeStream succeeds after retryable handshake network error", "runOnRequirements": [ { "serverless": "forbid" @@ -2967,7 +2967,7 @@ ] }, { - "description": "createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.createChangeStream succeeds after retryable handshake server error (ShutdownInProgress)", "runOnRequirements": [ { "serverless": "forbid" diff --git a/test/retryable_writes/unified/handshakeError.json b/test/retryable_writes/unified/handshakeError.json index 7b69451fe8..df37bd7232 100644 --- a/test/retryable_writes/unified/handshakeError.json +++ b/test/retryable_writes/unified/handshakeError.json @@ -1,6 +1,6 @@ { "description": "retryable writes handshake failures", - "schemaVersion": "1.4", + "schemaVersion": "1.3", "runOnRequirements": [ { "minServerVersion": "4.2", @@ -54,7 +54,7 @@ ], "tests": [ { - "description": "insertOne succeeds after retryable handshake network error", + "description": "collection.insertOne succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -150,7 +150,7 @@ ] }, { - "description": "insertOne succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.insertOne succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -246,7 +246,7 @@ ] }, { - "description": "insertMany succeeds after retryable handshake network error", + "description": "collection.insertMany succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -344,7 +344,7 @@ ] }, { - "description": "insertMany succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.insertMany succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -442,7 +442,7 @@ ] }, { - "description": "deleteOne succeeds after retryable handshake network error", + "description": "collection.deleteOne succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -535,7 +535,7 @@ ] }, { - "description": "deleteOne succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.deleteOne succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -628,7 +628,7 @@ ] }, { - "description": "replaceOne succeeds after retryable handshake network error", + "description": "collection.replaceOne succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -724,7 +724,7 @@ ] }, { - "description": "replaceOne succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.replaceOne succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -820,7 +820,7 @@ ] }, { - "description": "updateOne succeeds after retryable handshake network error", + "description": "collection.updateOne succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -918,7 +918,7 @@ ] }, { - "description": "updateOne succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.updateOne succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -1016,7 +1016,7 @@ ] }, { - "description": "findOneAndDelete succeeds after retryable handshake network error", + "description": "collection.findOneAndDelete succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -1109,7 +1109,7 @@ ] }, { - "description": "findOneAndDelete succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.findOneAndDelete succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -1202,7 +1202,7 @@ ] }, { - "description": "findOneAndReplace succeeds after retryable handshake network error", + "description": "collection.findOneAndReplace succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -1298,7 +1298,7 @@ ] }, { - "description": "findOneAndReplace succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.findOneAndReplace succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -1394,7 +1394,7 @@ ] }, { - "description": "findOneAndUpdate succeeds after retryable handshake network error", + "description": "collection.findOneAndUpdate succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -1492,7 +1492,7 @@ ] }, { - "description": "findOneAndUpdate succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.findOneAndUpdate succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", @@ -1590,7 +1590,7 @@ ] }, { - "description": "bulkWrite succeeds after retryable handshake network error", + "description": "collection.bulkWrite succeeds after retryable handshake network error", "operations": [ { "name": "failPoint", @@ -1692,7 +1692,7 @@ ] }, { - "description": "bulkWrite succeeds after retryable handshake server error (ShutdownInProgress)", + "description": "collection.bulkWrite succeeds after retryable handshake server error (ShutdownInProgress)", "operations": [ { "name": "failPoint", From 70add093ae9887db6a894986f23b9c53ce0a0e73 Mon Sep 17 00:00:00 2001 From: Shane Harvey Date: Tue, 15 Nov 2022 14:32:44 -0800 Subject: [PATCH 3/3] PYTHON-3500 Skip $listLocalSessions on serverless too --- test/retryable_reads/unified/handshakeError.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/retryable_reads/unified/handshakeError.json b/test/retryable_reads/unified/handshakeError.json index f5c43b45fe..2921d8a954 100644 --- a/test/retryable_reads/unified/handshakeError.json +++ b/test/retryable_reads/unified/handshakeError.json @@ -627,6 +627,11 @@ }, { "description": "database.aggregate succeeds after retryable handshake network error", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint", @@ -727,6 +732,11 @@ }, { "description": "database.aggregate succeeds after retryable handshake server error (ShutdownInProgress)", + "runOnRequirements": [ + { + "serverless": "forbid" + } + ], "operations": [ { "name": "failPoint",