diff --git a/test/csot/bulkWrite.json b/test/csot/bulkWrite.json index 14d5b654f6..9a05809f77 100644 --- a/test/csot/bulkWrite.json +++ b/test/csot/bulkWrite.json @@ -19,7 +19,10 @@ "useMultipleMongoses": false, "observeEvents": [ "commandStartedEvent" - ] + ], + "uriOptions": { + "w": 1 + } } }, { @@ -48,6 +51,13 @@ { "description": "timeoutMS applied to entire bulkWrite, not individual commands", "operations": [ + { + "name": "insertOne", + "object": "collection", + "arguments": { + "document": {} + } + }, { "name": "failPoint", "object": "testRunner", @@ -69,15 +79,6 @@ } } }, - { - "name": "find", - "object": "collection", - "arguments": { - "filter": { - "_id": 1 - } - } - }, { "name": "bulkWrite", "object": "collection", @@ -114,10 +115,10 @@ "events": [ { "commandStartedEvent": { - "commandName": "find", + "commandName": "insert", "databaseName": "test", "command": { - "find": "coll" + "insert": "coll" } } }, diff --git a/test/csot/retryability-legacy-timeouts.json b/test/csot/retryability-legacy-timeouts.json index cd2af7fab6..63e8efccfc 100644 --- a/test/csot/retryability-legacy-timeouts.json +++ b/test/csot/retryability-legacy-timeouts.json @@ -21,7 +21,7 @@ "client": { "id": "client", "uriOptions": { - "socketTimeoutMS": 50 + "socketTimeoutMS": 100 }, "useMultipleMongoses": false, "observeEvents": [ @@ -73,7 +73,7 @@ "insert" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -132,7 +132,7 @@ "insert" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -194,7 +194,7 @@ "insert" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -255,7 +255,7 @@ "insert" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -319,7 +319,7 @@ "delete" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -376,7 +376,7 @@ "delete" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -436,7 +436,7 @@ "update" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -496,7 +496,7 @@ "update" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -559,7 +559,7 @@ "update" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -621,7 +621,7 @@ "update" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -686,7 +686,7 @@ "findAndModify" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -743,7 +743,7 @@ "findAndModify" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -803,7 +803,7 @@ "findAndModify" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -863,7 +863,7 @@ "findAndModify" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -926,7 +926,7 @@ "findAndModify" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -988,7 +988,7 @@ "findAndModify" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -1053,7 +1053,7 @@ "insert" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -1118,7 +1118,7 @@ "insert" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -1186,7 +1186,7 @@ "listDatabases" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -1243,7 +1243,7 @@ "listDatabases" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -1303,7 +1303,7 @@ "listDatabases" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -1357,7 +1357,7 @@ "listDatabases" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -1414,7 +1414,7 @@ "aggregate" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -1471,7 +1471,7 @@ "aggregate" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -1531,7 +1531,7 @@ "aggregate" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -1595,7 +1595,7 @@ "aggregate" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -1662,7 +1662,7 @@ "listCollections" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -1719,7 +1719,7 @@ "listCollections" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -1779,7 +1779,7 @@ "listCollections" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -1836,7 +1836,7 @@ "listCollections" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -1896,7 +1896,7 @@ "aggregate" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -1953,7 +1953,7 @@ "aggregate" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2013,7 +2013,7 @@ "aggregate" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2070,7 +2070,7 @@ "aggregate" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2130,7 +2130,7 @@ "count" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2187,7 +2187,7 @@ "count" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2247,7 +2247,7 @@ "aggregate" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2304,7 +2304,7 @@ "aggregate" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2364,7 +2364,7 @@ "count" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2418,7 +2418,7 @@ "count" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2475,7 +2475,7 @@ "distinct" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2533,7 +2533,7 @@ "distinct" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2594,7 +2594,7 @@ "find" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2651,7 +2651,7 @@ "find" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2711,7 +2711,7 @@ "find" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2768,7 +2768,7 @@ "find" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2828,7 +2828,7 @@ "listIndexes" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2882,7 +2882,7 @@ "listIndexes" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2939,7 +2939,7 @@ "aggregate" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } @@ -2996,7 +2996,7 @@ "aggregate" ], "blockConnection": true, - "blockTimeMS": 55 + "blockTimeMS": 125 } } } diff --git a/test/csot/retryability-timeoutMS.json b/test/csot/retryability-timeoutMS.json index 438ba6b8d2..642eca0ee9 100644 --- a/test/csot/retryability-timeoutMS.json +++ b/test/csot/retryability-timeoutMS.json @@ -137,7 +137,7 @@ "name": "insertOne", "object": "collection", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "document": { "x": 1 } @@ -356,7 +356,7 @@ "name": "insertMany", "object": "collection", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "documents": [ { "x": 1 @@ -575,7 +575,7 @@ "name": "deleteOne", "object": "collection", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "filter": {} } } @@ -789,7 +789,7 @@ "name": "replaceOne", "object": "collection", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "filter": {}, "replacement": { "x": 1 @@ -1011,7 +1011,7 @@ "name": "updateOne", "object": "collection", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "filter": {}, "update": { "$set": { @@ -1232,7 +1232,7 @@ "name": "findOneAndDelete", "object": "collection", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "filter": {} } } @@ -1446,7 +1446,7 @@ "name": "findOneAndReplace", "object": "collection", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "filter": {}, "replacement": { "x": 1 @@ -1668,7 +1668,7 @@ "name": "findOneAndUpdate", "object": "collection", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "filter": {}, "update": { "$set": { @@ -1897,7 +1897,7 @@ "name": "bulkWrite", "object": "collection", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "requests": [ { "insertOne": { @@ -2124,7 +2124,7 @@ "name": "listDatabases", "object": "client", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "filter": {} } } @@ -2332,7 +2332,7 @@ "name": "listDatabaseNames", "object": "client", "arguments": { - "timeoutMS": 500 + "timeoutMS": 1000 } } ], @@ -2541,7 +2541,7 @@ "name": "createChangeStream", "object": "client", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "pipeline": [] } } @@ -2759,7 +2759,7 @@ "name": "aggregate", "object": "database", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "pipeline": [ { "$listLocalSessions": {} @@ -2984,7 +2984,7 @@ "name": "listCollections", "object": "database", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "filter": {} } } @@ -3195,7 +3195,7 @@ "name": "listCollectionNames", "object": "database", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "filter": {} } } @@ -3406,7 +3406,7 @@ "name": "createChangeStream", "object": "database", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "pipeline": [] } } @@ -3617,7 +3617,7 @@ "name": "aggregate", "object": "collection", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "pipeline": [] } } @@ -3828,7 +3828,7 @@ "name": "count", "object": "collection", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "filter": {} } } @@ -4039,7 +4039,7 @@ "name": "countDocuments", "object": "collection", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "filter": {} } } @@ -4247,7 +4247,7 @@ "name": "estimatedDocumentCount", "object": "collection", "arguments": { - "timeoutMS": 500 + "timeoutMS": 1000 } } ], @@ -4457,7 +4457,7 @@ "name": "distinct", "object": "collection", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "fieldName": "x", "filter": {} } @@ -4670,7 +4670,7 @@ "name": "find", "object": "collection", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "filter": {} } } @@ -4881,7 +4881,7 @@ "name": "findOne", "object": "collection", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "filter": {} } } @@ -5089,7 +5089,7 @@ "name": "listIndexes", "object": "collection", "arguments": { - "timeoutMS": 500 + "timeoutMS": 1000 } } ], @@ -5298,7 +5298,7 @@ "name": "createChangeStream", "object": "collection", "arguments": { - "timeoutMS": 500, + "timeoutMS": 1000, "pipeline": [] } } diff --git a/test/unified_format.py b/test/unified_format.py index 005e91f6b6..12eaceed35 100644 --- a/test/unified_format.py +++ b/test/unified_format.py @@ -963,8 +963,6 @@ def maybe_skip_test(self, spec): self.skipTest("CSOT not implemented for with_transaction") if "transaction" in class_name or "transaction" in description: self.skipTest("CSOT not implemented for transactions") - if "socket timeout" in description: - self.skipTest("CSOT not implemented for socket timeouts") # Some tests need to be skipped based on the operations they try to run. for op in spec["operations"]: