DRIVERS-2877: Follow w: 0 write with a find in spec tests (#1560)

This will force completion of the w: 0 write, which addresses a TCP-based race condition in the tests
mongodb · Apr 3, 2024 · cd08b72 · cd08b72
1 parent fa9a05a
commit cd08b72
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 4 deletions.
diff --git a/source/command-logging-and-monitoring/tests/logging/unacknowledged-write.json b/source/command-logging-and-monitoring/tests/logging/unacknowledged-write.json
diff --git a/source/command-logging-and-monitoring/tests/logging/unacknowledged-write.yml b/source/command-logging-and-monitoring/tests/logging/unacknowledged-write.yml
@@ -1,6 +1,6 @@
 description: "unacknowledged-write"
 
-schemaVersion: "1.13"
+schemaVersion: "1.16"
 
 createEntities:
  - client:
@@ -31,8 +31,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/source/command-logging-and-monitoring/tests/monitoring/unacknowledgedBulkWrite.json b/source/command-logging-and-monitoring/tests/monitoring/unacknowledgedBulkWrite.json
diff --git a/source/command-logging-and-monitoring/tests/monitoring/unacknowledgedBulkWrite.yml b/source/command-logging-and-monitoring/tests/monitoring/unacknowledgedBulkWrite.yml
@@ -1,6 +1,6 @@
 description: "unacknowledgedBulkWrite"
 
-schemaVersion: "1.0"
+schemaVersion: "1.7"
 
 createEntities:
  - client:
@@ -36,8 +36,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: