Revert "test: update read write concern tests"

durran · durran · commit 742199b40948 · 2023-06-19T16:35:20.000+02:00
This reverts commit 0f63cf0.
diff --git a/test/spec/read-write-concern/operation/default-write-concern-2.6.json b/test/spec/read-write-concern/operation/default-write-concern-2.6.json
@@ -44,7 +44,8 @@
                   "q": {},
                   "limit": 1
                 }
-              ]
+              ],
+              "writeConcern": null
             }
           }
         }
@@ -77,7 +78,8 @@
                   "q": {},
                   "limit": 0
                 }
-              ]
+              ],
+              "writeConcern": null
             }
           }
         }
@@ -211,7 +213,8 @@
                 {
                   "_id": 1
                 }
-              ]
+              ],
+              "writeConcern": null
             }
           }
         },
@@ -230,7 +233,8 @@
                     }
                   }
                 }
-              ]
+              ],
+              "writeConcern": null
             }
           }
         },
@@ -242,7 +246,8 @@
                 {
                   "_id": 2
                 }
-              ]
+              ],
+              "writeConcern": null
             }
           }
         },
@@ -259,7 +264,8 @@
                     "x": 2
                   }
                 }
-              ]
+              ],
+              "writeConcern": null
             }
           }
         },
@@ -271,7 +277,8 @@
                 {
                   "_id": 3
                 }
-              ]
+              ],
+              "writeConcern": null
             }
           }
         },
@@ -291,7 +298,8 @@
                   },
                   "multi": true
                 }
-              ]
+              ],
+              "writeConcern": null
             }
           }
         },
@@ -306,7 +314,8 @@
                   },
                   "limit": 1
                 }
-              ]
+              ],
+              "writeConcern": null
             }
           }
         }
@@ -485,7 +494,8 @@
                     }
                   }
                 }
-              ]
+              ],
+              "writeConcern": null
             }
           }
         },
@@ -505,7 +515,8 @@
                   },
                   "multi": true
                 }
-              ]
+              ],
+              "writeConcern": null
             }
           }
         },
@@ -522,7 +533,8 @@
                     "x": 3
                   }
                 }
-              ]
+              ],
+              "writeConcern": null
             }
           }
         }
diff --git a/test/spec/read-write-concern/operation/default-write-concern-2.6.yml b/test/spec/read-write-concern/operation/default-write-concern-2.6.yml
@@ -27,6 +27,7 @@ tests:
             delete: *collection_name
             deletes:
               - {q: {}, limit: 1}
+            writeConcern: null
   - description: DeleteMany omits default write concern
     operations:
       - name: deleteMany
@@ -41,6 +42,7 @@ tests:
           command:
             delete: *collection_name
             deletes: [{q: {}, limit: 0}]
+            writeConcern: null
   - description: BulkWrite with all models omits default write concern
     operations:
       - name: bulkWrite
@@ -93,35 +95,42 @@ tests:
             insert: *collection_name
             documents:
               - {_id: 1}
+            writeConcern: null
       - command_started_event:
           command:
             update: *collection_name
             updates:
               - {q: {_id: 1}, u: {$set: {x: 1}}}
+            writeConcern: null
       - command_started_event:
           command:
             insert: *collection_name
             documents:
               - {_id: 2}
+            writeConcern: null
       - command_started_event:
           command:
             update: *collection_name
             updates:
               - {q: {_id: 1}, u: {x: 2}}
+            writeConcern: null
       - command_started_event:
           command:
             insert: *collection_name
             documents:
               - {_id: 3}
+            writeConcern: null
       - command_started_event:
           command:
             update: *collection_name
             updates: 
               - {q: {_id: 1}, u: {$set: {x: 3}}, multi: true}
+            writeConcern: null
       - command_started_event:
           command:
             delete: *collection_name
             deletes: [{q: {_id: 3}, limit: 1}]
+            writeConcern: null
   - description: 'InsertOne and InsertMany omit default write concern'
     operations:
       - name: insertOne
@@ -191,13 +200,16 @@ tests:
             update: *collection_name
             updates:
               - {q: {_id: 1}, u: {$set: {x: 1}}}
+            writeConcern: null
       - command_started_event:
           command:
             update: *collection_name
             updates:
               - {q: {_id: 2}, u: {$set: {x: 2}}, multi: true}
+            writeConcern: null
       - command_started_event:
           command:
             update: *collection_name
             updates:
-              - {q: {_id: 2}, u: {x: 3}}
+              - {q: {_id: 2}, u: {x: 3}}
+            writeConcern: null
diff --git a/test/spec/read-write-concern/operation/default-write-concern-3.2.json b/test/spec/read-write-concern/operation/default-write-concern-3.2.json
@@ -88,7 +88,8 @@
                 "$set": {
                   "x": 1
                 }
-              }
+              },
+              "writeConcern": null
             }
           }
         },
@@ -101,7 +102,8 @@
               },
               "update": {
                 "x": 2
-              }
+              },
+              "writeConcern": null
             }
           }
         },
@@ -112,7 +114,8 @@
               "query": {
                 "_id": 2
               },
-              "remove": true
+              "remove": true,
+              "writeConcern": null
             }
           }
         }
diff --git a/test/spec/read-write-concern/operation/default-write-concern-3.2.yml b/test/spec/read-write-concern/operation/default-write-concern-3.2.yml
@@ -43,13 +43,16 @@ tests:
             findAndModify: *collection_name
             query: {_id: 1}
             update: {$set: {x: 1}}
+            writeConcern: null
       - command_started_event:
           command:
             findAndModify: *collection_name
             query: {_id: 2}
             update: {x: 2}
+            writeConcern: null
       - command_started_event:
           command:
             findAndModify: *collection_name
             query: {_id: 2}
-            remove: true
+            remove: true
+            writeConcern: null
diff --git a/test/spec/read-write-concern/operation/default-write-concern-3.4.json b/test/spec/read-write-concern/operation/default-write-concern-3.4.json
@@ -69,7 +69,8 @@
                 {
                   "$out": "other_collection_name"
                 }
-              ]
+              ],
+              "writeConcern": null
             }
           }
         }
@@ -108,7 +109,8 @@
                   "q": {},
                   "limit": 1
                 }
-              ]
+              ],
+              "writeConcern": null
             }
           }
         }
@@ -161,7 +163,8 @@
           "command_started_event": {
             "command": {
               "dropIndexes": "default_write_concern_coll",
-              "index": "x_1"
+              "index": "x_1",
+              "writeConcern": null
             }
           }
         }
@@ -202,7 +205,8 @@
               },
               "out": {
                 "inline": 1
-              }
+              },
+              "writeConcern": null
             }
           }
         }
diff --git a/test/spec/read-write-concern/operation/default-write-concern-3.4.yml b/test/spec/read-write-concern/operation/default-write-concern-3.4.yml
@@ -32,6 +32,7 @@ tests:
           command:
             aggregate: *collection_name
             pipeline: *out_pipeline
+            writeConcern: null
   - description: RunCommand with a write command omits default write concern (runCommand should never inherit write concern)
     operations:
       - object: database
@@ -49,6 +50,7 @@ tests:
             delete: *collection_name
             deletes:
               - {q: {}, limit: 1}
+            writeConcern: null
   - description: CreateIndex and dropIndex omits default write concern 
     operations:
       - object: collection
@@ -73,6 +75,7 @@ tests:
           command:
             dropIndexes: *collection_name
             index: x_1
+            writeConcern: null
   - description: MapReduce omits default write concern
     operations:
       - name: mapReduce
@@ -88,4 +91,5 @@ tests:
             mapReduce: *collection_name
             map: { $code: 'function inc() { return emit(0, this.x + 1) }' }
             reduce: { $code: 'function sum(key, values) { return values.reduce((acc, x) => acc + x); }' }
-            out: { inline: 1 }
+            out: { inline: 1 }
+            writeConcern: null
diff --git a/test/spec/read-write-concern/operation/default-write-concern-4.2.json b/test/spec/read-write-concern/operation/default-write-concern-4.2.json
@@ -65,7 +65,8 @@
                     "into": "other_collection_name"
                   }
                 }
-              ]
+              ],
+              "writeConcern": null
             }
           }
         }
diff --git a/test/spec/read-write-concern/operation/default-write-concern-4.2.yml b/test/spec/read-write-concern/operation/default-write-concern-4.2.yml
@@ -27,6 +27,8 @@ tests:
           command:
             aggregate: *collection_name
             pipeline: *merge_pipeline
+            # "null" fields will be checked for non-existence
+            writeConcern: null
     outcome:
       collection:
         name: *other_collection_name

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@`
`44`	`44`	`"q": {},`
`45`	`45`	`"limit": 1`
`46`	`46`	`}`
`47`		`- ]`
	`47`	`+ ],`
	`48`	`+ "writeConcern": null`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`	`}`
`@@ -77,7 +78,8 @@`
`77`	`78`	`"q": {},`
`78`	`79`	`"limit": 0`
`79`	`80`	`}`
`80`		`- ]`
	`81`	`+ ],`
	`82`	`+ "writeConcern": null`
`81`	`83`	`}`
`82`	`84`	`}`
`83`	`85`	`}`
`@@ -211,7 +213,8 @@`
`211`	`213`	`{`
`212`	`214`	`"_id": 1`
`213`	`215`	`}`
`214`		`- ]`
	`216`	`+ ],`
	`217`	`+ "writeConcern": null`
`215`	`218`	`}`
`216`	`219`	`}`
`217`	`220`	`},`
`@@ -230,7 +233,8 @@`
`230`	`233`	`}`
`231`	`234`	`}`
`232`	`235`	`}`
`233`		`- ]`
	`236`	`+ ],`
	`237`	`+ "writeConcern": null`
`234`	`238`	`}`
`235`	`239`	`}`
`236`	`240`	`},`
`@@ -242,7 +246,8 @@`
`242`	`246`	`{`
`243`	`247`	`"_id": 2`
`244`	`248`	`}`
`245`		`- ]`
	`249`	`+ ],`
	`250`	`+ "writeConcern": null`
`246`	`251`	`}`
`247`	`252`	`}`
`248`	`253`	`},`
`@@ -259,7 +264,8 @@`
`259`	`264`	`"x": 2`
`260`	`265`	`}`
`261`	`266`	`}`
`262`		`- ]`
	`267`	`+ ],`
	`268`	`+ "writeConcern": null`
`263`	`269`	`}`
`264`	`270`	`}`
`265`	`271`	`},`
`@@ -271,7 +277,8 @@`
`271`	`277`	`{`
`272`	`278`	`"_id": 3`
`273`	`279`	`}`
`274`		`- ]`
	`280`	`+ ],`
	`281`	`+ "writeConcern": null`
`275`	`282`	`}`
`276`	`283`	`}`
`277`	`284`	`},`
`@@ -291,7 +298,8 @@`
`291`	`298`	`},`
`292`	`299`	`"multi": true`
`293`	`300`	`}`
`294`		`- ]`
	`301`	`+ ],`
	`302`	`+ "writeConcern": null`
`295`	`303`	`}`
`296`	`304`	`}`
`297`	`305`	`},`
`@@ -306,7 +314,8 @@`
`306`	`314`	`},`
`307`	`315`	`"limit": 1`
`308`	`316`	`}`
`309`		`- ]`
	`317`	`+ ],`
	`318`	`+ "writeConcern": null`
`310`	`319`	`}`
`311`	`320`	`}`
`312`	`321`	`}`
`@@ -485,7 +494,8 @@`
`485`	`494`	`}`
`486`	`495`	`}`
`487`	`496`	`}`
`488`		`- ]`
	`497`	`+ ],`
	`498`	`+ "writeConcern": null`
`489`	`499`	`}`
`490`	`500`	`}`
`491`	`501`	`},`
`@@ -505,7 +515,8 @@`
`505`	`515`	`},`
`506`	`516`	`"multi": true`
`507`	`517`	`}`
`508`		`- ]`
	`518`	`+ ],`
	`519`	`+ "writeConcern": null`
`509`	`520`	`}`
`510`	`521`	`}`
`511`	`522`	`},`
`@@ -522,7 +533,8 @@`
`522`	`533`	`"x": 3`
`523`	`534`	`}`
`524`	`535`	`}`
`525`		`- ]`
	`536`	`+ ],`
	`537`	`+ "writeConcern": null`
`526`	`538`	`}`
`527`	`539`	`}`
`528`	`540`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,8 @@`
`88`	`88`	`"$set": {`
`89`	`89`	`"x": 1`
`90`	`90`	`}`
`91`		`- }`
	`91`	`+ },`
	`92`	`+ "writeConcern": null`
`92`	`93`	`}`
`93`	`94`	`}`
`94`	`95`	`},`
`@@ -101,7 +102,8 @@`
`101`	`102`	`},`
`102`	`103`	`"update": {`
`103`	`104`	`"x": 2`
`104`		`- }`
	`105`	`+ },`
	`106`	`+ "writeConcern": null`
`105`	`107`	`}`
`106`	`108`	`}`
`107`	`109`	`},`
`@@ -112,7 +114,8 @@`
`112`	`114`	`"query": {`
`113`	`115`	`"_id": 2`
`114`	`116`	`},`
`115`		`- "remove": true`
	`117`	`+ "remove": true,`
	`118`	`+ "writeConcern": null`
`116`	`119`	`}`
`117`	`120`	`}`
`118`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,8 @@`
`69`	`69`	`{`
`70`	`70`	`"$out": "other_collection_name"`
`71`	`71`	`}`
`72`		`- ]`
	`72`	`+ ],`
	`73`	`+ "writeConcern": null`
`73`	`74`	`}`
`74`	`75`	`}`
`75`	`76`	`}`
`@@ -108,7 +109,8 @@`
`108`	`109`	`"q": {},`
`109`	`110`	`"limit": 1`
`110`	`111`	`}`
`111`		`- ]`
	`112`	`+ ],`
	`113`	`+ "writeConcern": null`
`112`	`114`	`}`
`113`	`115`	`}`
`114`	`116`	`}`
`@@ -161,7 +163,8 @@`
`161`	`163`	`"command_started_event": {`
`162`	`164`	`"command": {`
`163`	`165`	`"dropIndexes": "default_write_concern_coll",`
`164`		`- "index": "x_1"`
	`166`	`+ "index": "x_1",`
	`167`	`+ "writeConcern": null`
`165`	`168`	`}`
`166`	`169`	`}`
`167`	`170`	`}`
`@@ -202,7 +205,8 @@`
`202`	`205`	`},`
`203`	`206`	`"out": {`
`204`	`207`	`"inline": 1`
`205`		`- }`
	`208`	`+ },`
	`209`	`+ "writeConcern": null`
`206`	`210`	`}`
`207`	`211`	`}`
`208`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@`
`65`	`65`	`"into": "other_collection_name"`
`66`	`66`	`}`
`67`	`67`	`}`
`68`		`- ]`
	`68`	`+ ],`
	`69`	`+ "writeConcern": null`
`69`	`70`	`}`
`70`	`71`	`}`
`71`	`72`	`}`