diff --git a/test/connection_logging/connection-pool-options.json b/test/connection_logging/connection-pool-options.json index 7055a54869..b7e6474e61 100644 --- a/test/connection_logging/connection-pool-options.json +++ b/test/connection_logging/connection-pool-options.json @@ -297,162 +297,6 @@ ] } ] - }, - { - "description": "waitQueueSize should be included in connection pool created message when specified", - "operations": [ - { - "name": "createEntities", - "object": "testRunner", - "arguments": { - "entities": [ - { - "client": { - "id": "client", - "observeEvents": [ - "poolReadyEvent" - ], - "observeLogMessages": { - "connection": "debug" - }, - "uriOptions": { - "waitQueueSize": 100 - } - } - } - ] - } - }, - { - "name": "waitForEvent", - "object": "testRunner", - "arguments": { - "client": "client", - "event": { - "poolReadyEvent": {} - }, - "count": 1 - } - } - ], - "expectLogMessages": [ - { - "client": "client", - "messages": [ - { - "level": "debug", - "component": "connection", - "data": { - "message": "Connection pool created", - "serverHost": { - "$$type": "string" - }, - "serverPort": { - "$$type": [ - "int", - "long" - ] - }, - "waitQueueSize": 100 - } - }, - { - "level": "debug", - "component": "connection", - "data": { - "message": "Connection pool ready", - "serverHost": { - "$$type": "string" - }, - "serverPort": { - "$$type": [ - "int", - "long" - ] - } - } - } - ] - } - ] - }, - { - "description": "waitQueueMultiple should be included in connection pool created message when specified", - "operations": [ - { - "name": "createEntities", - "object": "testRunner", - "arguments": { - "entities": [ - { - "client": { - "id": "client", - "observeEvents": [ - "poolReadyEvent" - ], - "observeLogMessages": { - "connection": "debug" - }, - "uriOptions": { - "waitQueueSize": 5 - } - } - } - ] - } - }, - { - "name": "waitForEvent", - "object": "testRunner", - "arguments": { - "client": "client", - "event": { - "poolReadyEvent": {} - }, - "count": 1 - } - } - ], - "expectLogMessages": [ - { - "client": "client", - "messages": [ - { - "level": "debug", - "component": "connection", - "data": { - "message": "Connection pool created", - "serverHost": { - "$$type": "string" - }, - "serverPort": { - "$$type": [ - "int", - "long" - ] - }, - "waitQueueMultiple": 5 - } - }, - { - "level": "debug", - "component": "connection", - "data": { - "message": "Connection pool ready", - "serverHost": { - "$$type": "string" - }, - "serverPort": { - "$$type": [ - "int", - "long" - ] - } - } - } - ] - } - ] } ] } diff --git a/test/read_write_concern/write-concern-errors/aggregate.json b/test/read_write_concern/write-concern-errors/aggregate.json index e4b33ae33c..b55beb932e 100644 --- a/test/read_write_concern/write-concern-errors/aggregate.json +++ b/test/read_write_concern/write-concern-errors/aggregate.json @@ -50,7 +50,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -98,7 +99,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } diff --git a/test/read_write_concern/write-concern-errors/bulkWrite.json b/test/read_write_concern/write-concern-errors/bulkWrite.json index a357c77c55..2aabb4bfb0 100644 --- a/test/read_write_concern/write-concern-errors/bulkWrite.json +++ b/test/read_write_concern/write-concern-errors/bulkWrite.json @@ -43,7 +43,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } diff --git a/test/read_write_concern/write-concern-errors/client-bulkWrite.json b/test/read_write_concern/write-concern-errors/client-bulkWrite.json index bedd9f2b2e..de8bfe7c95 100644 --- a/test/read_write_concern/write-concern-errors/client-bulkWrite.json +++ b/test/read_write_concern/write-concern-errors/client-bulkWrite.json @@ -34,7 +34,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } diff --git a/test/read_write_concern/write-concern-errors/client-side-encryption.json b/test/read_write_concern/write-concern-errors/client-side-encryption.json index efd5766fb3..590f2f9411 100644 --- a/test/read_write_concern/write-concern-errors/client-side-encryption.json +++ b/test/read_write_concern/write-concern-errors/client-side-encryption.json @@ -89,7 +89,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -129,7 +130,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -166,7 +168,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -208,7 +211,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -251,7 +255,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } diff --git a/test/read_write_concern/write-concern-errors/crud.json b/test/read_write_concern/write-concern-errors/crud.json index 7a92433869..763f44023f 100644 --- a/test/read_write_concern/write-concern-errors/crud.json +++ b/test/read_write_concern/write-concern-errors/crud.json @@ -43,7 +43,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -82,7 +83,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -126,7 +128,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -170,7 +173,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -212,7 +216,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -254,7 +259,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -293,7 +299,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } diff --git a/test/read_write_concern/write-concern-errors/db-coll-management.json b/test/read_write_concern/write-concern-errors/db-coll-management.json index 11154849ce..84f05d1936 100644 --- a/test/read_write_concern/write-concern-errors/db-coll-management.json +++ b/test/read_write_concern/write-concern-errors/db-coll-management.json @@ -57,7 +57,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -94,7 +95,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -138,7 +140,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -175,7 +178,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } diff --git a/test/read_write_concern/write-concern-errors/findAndModify.json b/test/read_write_concern/write-concern-errors/findAndModify.json index 91dbf833aa..05e55b836b 100644 --- a/test/read_write_concern/write-concern-errors/findAndModify.json +++ b/test/read_write_concern/write-concern-errors/findAndModify.json @@ -43,7 +43,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -87,7 +88,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -129,7 +131,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } diff --git a/test/read_write_concern/write-concern-errors/gridfs.json b/test/read_write_concern/write-concern-errors/gridfs.json index d433c68e08..bf753ee609 100644 --- a/test/read_write_concern/write-concern-errors/gridfs.json +++ b/test/read_write_concern/write-concern-errors/gridfs.json @@ -66,7 +66,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -106,7 +107,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -146,7 +148,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -185,7 +188,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -222,7 +226,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -262,7 +267,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } diff --git a/test/read_write_concern/write-concern-errors/index-management.json b/test/read_write_concern/write-concern-errors/index-management.json index 56fee80e7a..61aafe1d4f 100644 --- a/test/read_write_concern/write-concern-errors/index-management.json +++ b/test/read_write_concern/write-concern-errors/index-management.json @@ -43,7 +43,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -92,7 +93,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } @@ -139,7 +141,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } } diff --git a/test/read_write_concern/write-concern-errors/mapReduce.json b/test/read_write_concern/write-concern-errors/mapReduce.json index 7701a43934..ce5979fabe 100644 --- a/test/read_write_concern/write-concern-errors/mapReduce.json +++ b/test/read_write_concern/write-concern-errors/mapReduce.json @@ -59,7 +59,8 @@ ], "writeConcernError": { "code": 79, - "codeName": "UnknownReplWriteConcern" + "codeName": "UnknownReplWriteConcern", + "errmsg": "Triggered by failpoint" } } }