GODRIVER-3074 Sync index management tests (mongodb#1510)

prestonvasquez · web-flow · commit 1415137a1a3c · 2024-01-05T10:26:12.000-07:00
diff --git a/mongo/integration/unified/unified_spec_runner.go b/mongo/integration/unified/unified_spec_runner.go
@@ -27,9 +27,16 @@ var (
 		// GODRIVER-1773: This test runs a "find" with limit=4 and batchSize=3. It expects batchSize values of three for
 		// the "find" and one for the "getMore", but we send three for both.
 		"A successful find event with a getmore and the server kills the cursor (<= 4.4)": "See GODRIVER-1773",
+
 		// TODO(GODRIVER-2843): Fix and unskip these test cases.
 		"Find operation with snapshot":                                      "Test fails frequently. See GODRIVER-2843",
 		"Write commands with snapshot session do not affect snapshot reads": "Test fails frequently. See GODRIVER-2843",
+
+		// TODO(GODRIVER-3043): Avoid Appending Write/Read Concern in Atlas Search
+		// Index Helper Commands.
+		"dropSearchIndex ignores read and write concern":       "Sync GODRIVER-3074, but skip testing bug GODRIVER-3043",
+		"listSearchIndexes ignores read and write concern":     "Sync GODRIVER-3074, but skip testing bug GODRIVER-3043",
+		"updateSearchIndex ignores the read and write concern": "Sync GODRIVER-3074, but skip testing bug GODRIVER-3043",
 	}
 
 	logMessageValidatorTimeout = 10 * time.Millisecond
diff --git a/testdata/index-management/createSearchIndex.json b/testdata/index-management/createSearchIndex.json
@@ -55,7 +55,7 @@
           },
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],
@@ -102,7 +102,7 @@
           },
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],
@@ -133,4 +133,4 @@
       ]
     }
   ]
-}
+}
diff --git a/testdata/index-management/createSearchIndex.yml b/testdata/index-management/createSearchIndex.yml
@@ -30,8 +30,9 @@ tests:
         expectError:
           # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
           # that the driver constructs and sends the correct command.
+          # The expected error message was changed in SERVER-83003. Check for the substring "Atlas" shared by both error messages.
           isError: true
-          errorContains: Search index commands are only supported with Atlas
+          errorContains: Atlas
     expectEvents:
       - client: *client0
         events:
@@ -50,13 +51,14 @@ tests:
         expectError:
           # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
           # that the driver constructs and sends the correct command.
+          # The expected error message was changed in SERVER-83003. Check for the substring "Atlas" shared by both error messages.
           isError: true
-          errorContains: Search index commands are only supported with Atlas
+          errorContains: Atlas
     expectEvents:
       - client: *client0
         events:
           - commandStartedEvent:
               command:
                 createSearchIndexes: *collection0
                 indexes: [ { definition: *definition, name: 'test index' } ]
-                $db: *database0
+                $db: *database0
diff --git a/testdata/index-management/createSearchIndexes.json b/testdata/index-management/createSearchIndexes.json
@@ -49,7 +49,7 @@
           },
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],
@@ -89,7 +89,7 @@
           },
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],
@@ -138,7 +138,7 @@
           },
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],
@@ -169,4 +169,4 @@
       ]
     }
   ]
-}
+}
diff --git a/testdata/index-management/createSearchIndexes.yml b/testdata/index-management/createSearchIndexes.yml
@@ -30,8 +30,9 @@ tests:
         expectError:
           # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
           # that the driver constructs and sends the correct command.
+          # The expected error message was changed in SERVER-83003. Check for the substring "Atlas" shared by both error messages.
           isError: true
-          errorContains: Search index commands are only supported with Atlas
+          errorContains: Atlas
     expectEvents:
       - client: *client0
         events:
@@ -51,8 +52,9 @@ tests:
         expectError:
           # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
           # that the driver constructs and sends the correct command.
+          # The expected error message was changed in SERVER-83003. Check for the substring "Atlas" shared by both error messages.
           isError: true
-          errorContains: Search index commands are only supported with Atlas
+          errorContains: Atlas
     expectEvents:
       - client: *client0
         events:
@@ -71,13 +73,14 @@ tests:
         expectError:
           # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
           # that the driver constructs and sends the correct command.
+          # The expected error message was changed in SERVER-83003. Check for the substring "Atlas" shared by both error messages.
           isError: true
-          errorContains: Search index commands are only supported with Atlas
+          errorContains: Atlas
     expectEvents:
       - client: *client0
         events:
           - commandStartedEvent:
               command:
                 createSearchIndexes: *collection0
                 indexes: [ { definition: *definition, name: 'test index' } ]
-                $db: *database0
+                $db: *database0
diff --git a/testdata/index-management/dropSearchIndex.json b/testdata/index-management/dropSearchIndex.json
@@ -49,7 +49,7 @@
           },
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],
@@ -71,4 +71,4 @@
       ]
     }
   ]
-}
+}
diff --git a/testdata/index-management/dropSearchIndex.yml b/testdata/index-management/dropSearchIndex.yml
@@ -30,13 +30,14 @@ tests:
         expectError:
           # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
           # that the driver constructs and sends the correct command.
+          # The expected error message was changed in SERVER-83003. Check for the substring "Atlas" shared by both error messages.
           isError: true
-          errorContains: Search index commands are only supported with Atlas
+          errorContains: Atlas
     expectEvents:
       - client: *client0
         events:
           - commandStartedEvent:
               command:
                 dropSearchIndex: *collection0
                 name: *indexName
-                $db: *database0
+                $db: *database0
diff --git a/testdata/index-management/listSearchIndexes.json b/testdata/index-management/listSearchIndexes.json
@@ -46,7 +46,7 @@
           "object": "collection0",
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],
@@ -81,7 +81,7 @@
           },
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],
@@ -122,7 +122,7 @@
           },
           "expectError": {
             "isError": true,
-            "errorContains": "Search index commands are only supported with Atlas"
+            "errorContains": "Atlas"
           }
         }
       ],
@@ -153,4 +153,4 @@
       ]
     }
   ]
-}
+}
diff --git a/testdata/index-management/listSearchIndexes.yml b/testdata/index-management/listSearchIndexes.yml
@@ -28,8 +28,9 @@ tests:
         expectError:
           # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
           # that the driver constructs and sends the correct command.
+          # The expected error message was changed in SERVER-83003. Check for the substring "Atlas" shared by both error messages.
           isError: true
-          errorContains: Search index commands are only supported with Atlas
+          errorContains: Atlas
     expectEvents:
       - client: *client0
         events:
@@ -48,8 +49,9 @@ tests:
         expectError:
           # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
           # that the driver constructs and sends the correct command.
+          # The expected error message was changed in SERVER-83003. Check for the substring "Atlas" shared by both error messages.
           isError: true
-          errorContains: Search index commands are only supported with Atlas
+          errorContains: Atlas
     expectEvents:
       - client: *client0
         events:
@@ -71,8 +73,9 @@ tests:
         expectError:
           # This test always errors in a non-Atlas environment.  The test functions as a unit test  by asserting
           # that the driver constructs and sends the correct command.
+          # The expected error message was changed in SERVER-83003. Check for the substring "Atlas" shared by both error messages.
           isError: true
-          errorContains: Search index commands are only supported with Atlas
+          errorContains: Atlas
     expectEvents:
       - client: *client0
         events:
@@ -82,4 +85,4 @@ tests:
                 cursor: { batchSize: 10 }
                 pipeline:
                   - $listSearchIndexes: { name: *indexName }
-                $db: *database0
+                $db: *database0
diff --git a/testdata/index-management/searchIndexIgnoresReadWriteConcern.json b/testdata/index-management/searchIndexIgnoresReadWriteConcern.json
diff --git a/testdata/index-management/searchIndexIgnoresReadWriteConcern.yml b/testdata/index-management/searchIndexIgnoresReadWriteConcern.yml
diff --git a/testdata/index-management/updateSearchIndex.json b/testdata/index-management/updateSearchIndex.json
diff --git a/testdata/index-management/updateSearchIndex.yml b/testdata/index-management/updateSearchIndex.yml

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	`},`
`56`	`56`	`"expectError": {`
`57`	`57`	`"isError": true,`
`58`		`- "errorContains": "Search index commands are only supported with Atlas"`
	`58`	`+ "errorContains": "Atlas"`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`],`
`@@ -102,7 +102,7 @@`
`102`	`102`	`},`
`103`	`103`	`"expectError": {`
`104`	`104`	`"isError": true,`
`105`		`- "errorContains": "Search index commands are only supported with Atlas"`
	`105`	`+ "errorContains": "Atlas"`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`],`
`@@ -133,4 +133,4 @@`
`133`	`133`	`]`
`134`	`134`	`}`
`135`	`135`	`]`
`136`		`-}`
	`136`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`},`
`50`	`50`	`"expectError": {`
`51`	`51`	`"isError": true,`
`52`		`- "errorContains": "Search index commands are only supported with Atlas"`
	`52`	`+ "errorContains": "Atlas"`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`],`
`@@ -89,7 +89,7 @@`
`89`	`89`	`},`
`90`	`90`	`"expectError": {`
`91`	`91`	`"isError": true,`
`92`		`- "errorContains": "Search index commands are only supported with Atlas"`
	`92`	`+ "errorContains": "Atlas"`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`	`],`
`@@ -138,7 +138,7 @@`
`138`	`138`	`},`
`139`	`139`	`"expectError": {`
`140`	`140`	`"isError": true,`
`141`		`- "errorContains": "Search index commands are only supported with Atlas"`
	`141`	`+ "errorContains": "Atlas"`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`	`],`
`@@ -169,4 +169,4 @@`
`169`	`169`	`]`
`170`	`170`	`}`
`171`	`171`	`]`
`172`		`-}`
	`172`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`"object": "collection0",`
`47`	`47`	`"expectError": {`
`48`	`48`	`"isError": true,`
`49`		`- "errorContains": "Search index commands are only supported with Atlas"`
	`49`	`+ "errorContains": "Atlas"`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`],`
`@@ -81,7 +81,7 @@`
`81`	`81`	`},`
`82`	`82`	`"expectError": {`
`83`	`83`	`"isError": true,`
`84`		`- "errorContains": "Search index commands are only supported with Atlas"`
	`84`	`+ "errorContains": "Atlas"`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`],`
`@@ -122,7 +122,7 @@`
`122`	`122`	`},`
`123`	`123`	`"expectError": {`
`124`	`124`	`"isError": true,`
`125`		`- "errorContains": "Search index commands are only supported with Atlas"`
	`125`	`+ "errorContains": "Atlas"`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`	`],`
`@@ -153,4 +153,4 @@`
`153`	`153`	`]`
`154`	`154`	`}`
`155`	`155`	`]`
`156`		`-}`
	`156`	`+}`