CSHARP-5120: Use single mongos in racy unacknowledged write tests.

rstam · rstam · commit 43e673eb200d · 2024-06-18T08:02:32.000-07:00
diff --git a/specifications/command-logging-and-monitoring/tests/logging/unacknowledged-write.json b/specifications/command-logging-and-monitoring/tests/logging/unacknowledged-write.json
@@ -1,10 +1,11 @@
 {
   "description": "unacknowledged-write",
-  "schemaVersion": "1.13",
+  "schemaVersion": "1.16",
   "createEntities": [
     {
       "client": {
         "id": "client",
+        "useMultipleMongoses": false,
         "observeLogMessages": {
           "command": "debug"
         }
@@ -53,11 +54,27 @@
               "_id": 2
             }
           }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "expectResult": [
+            {
+              "_id": 1
+            },
+            {
+              "_id": 2
+            }
+          ]
         }
       ],
       "expectLogMessages": [
         {
           "client": "client",
+          "ignoreExtraMessages": true,
           "messages": [
             {
               "level": "debug",
diff --git a/specifications/command-logging-and-monitoring/tests/logging/unacknowledged-write.yml b/specifications/command-logging-and-monitoring/tests/logging/unacknowledged-write.yml
@@ -1,10 +1,11 @@
 description: "unacknowledged-write"
 
-schemaVersion: "1.13"
+schemaVersion: "1.16"
 
 createEntities:
   - client:
       id: &client client
+      useMultipleMongoses: false
       observeLogMessages:
         command: debug
   - database:
@@ -31,8 +32,18 @@ tests:
         object: *collection
         arguments:
           document: { _id: 2 }
+      # Force completion of the w: 0 write by executing a find on the same connection
+      - name: find
+        object: *collection
+        arguments:
+          filter: { }
+        expectResult: [
+          { _id: 1 },
+          { _id: 2 }
+        ]
     expectLogMessages:
       - client: *client
+        ignoreExtraMessages: true
         messages:
           - level: debug
             component: command
diff --git a/specifications/command-logging-and-monitoring/tests/monitoring/unacknowledgedBulkWrite.json b/specifications/command-logging-and-monitoring/tests/monitoring/unacknowledgedBulkWrite.json
@@ -1,10 +1,11 @@
 {
   "description": "unacknowledgedBulkWrite",
-  "schemaVersion": "1.0",
+  "schemaVersion": "1.7",
   "createEntities": [
     {
       "client": {
         "id": "client",
+        "useMultipleMongoses": false,
         "observeEvents": [
           "commandStartedEvent",
           "commandSucceededEvent",
@@ -64,11 +65,29 @@
             ],
             "ordered": false
           }
+        },
+        {
+          "name": "find",
+          "object": "collection",
+          "arguments": {
+            "filter": {}
+          },
+          "expectResult": [
+            {
+              "_id": 1,
+              "x": 11
+            },
+            {
+              "_id": "unorderedBulkWriteInsertW0",
+              "x": 44
+            }
+          ]
         }
       ],
       "expectEvents": [
         {
           "client": "client",
+          "ignoreExtraEvents": true,
           "events": [
             {
               "commandStartedEvent": {
diff --git a/specifications/command-logging-and-monitoring/tests/monitoring/unacknowledgedBulkWrite.yml b/specifications/command-logging-and-monitoring/tests/monitoring/unacknowledgedBulkWrite.yml
@@ -1,10 +1,11 @@
 description: "unacknowledgedBulkWrite"
 
-schemaVersion: "1.0"
+schemaVersion: "1.7"
 
 createEntities:
   - client:
       id: &client client
+      useMultipleMongoses: false
       observeEvents:
         - commandStartedEvent
         - commandSucceededEvent
@@ -36,8 +37,18 @@ tests:
             - insertOne:
                 document: { _id: "unorderedBulkWriteInsertW0", x: 44 }
           ordered: false
+      # Force completion of the w: 0 write by executing a find on the same connection
+      - name: find
+        object: *collection
+        arguments:
+          filter: { }
+        expectResult: [
+          { _id: 1, x: 11 },
+          { _id: "unorderedBulkWriteInsertW0", x: 44 }
+        ]
     expectEvents:
       - client: *client
+        ignoreExtraEvents: true
         events:
           - commandStartedEvent:
               command:

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"description": "unacknowledged-write",`
`3`		`- "schemaVersion": "1.13",`
	`3`	`+ "schemaVersion": "1.16",`
`4`	`4`	`"createEntities": [`
`5`	`5`	`{`
`6`	`6`	`"client": {`
`7`	`7`	`"id": "client",`
	`8`	`+ "useMultipleMongoses": false,`
`8`	`9`	`"observeLogMessages": {`
`9`	`10`	`"command": "debug"`
`10`	`11`	`}`
`@@ -53,11 +54,27 @@`
`53`	`54`	`"_id": 2`
`54`	`55`	`}`
`55`	`56`	`}`
	`57`	`+ },`
	`58`	`+ {`
	`59`	`+ "name": "find",`
	`60`	`+ "object": "collection",`
	`61`	`+ "arguments": {`
	`62`	`+ "filter": {}`
	`63`	`+ },`
	`64`	`+ "expectResult": [`
	`65`	`+ {`
	`66`	`+ "_id": 1`
	`67`	`+ },`
	`68`	`+ {`
	`69`	`+ "_id": 2`
	`70`	`+ }`
	`71`	`+ ]`
`56`	`72`	`}`
`57`	`73`	`],`
`58`	`74`	`"expectLogMessages": [`
`59`	`75`	`{`
`60`	`76`	`"client": "client",`
	`77`	`+ "ignoreExtraMessages": true,`
`61`	`78`	`"messages": [`
`62`	`79`	`{`
`63`	`80`	`"level": "debug",`