update crud tests

prashantmital · prashantmital · commit eb61ba86a157 · 2021-07-26T15:31:07.000-07:00
diff --git a/test/crud/v1/read/aggregate-collation.json b/test/crud/v1/read/aggregate-collation.json
@@ -6,6 +6,7 @@
     }
   ],
   "minServerVersion": "3.4",
+  "serverless": "forbid",
   "tests": [
     {
       "description": "Aggregate with collation",
diff --git a/test/crud/v1/read/aggregate-out.json b/test/crud/v1/read/aggregate-out.json
@@ -14,6 +14,7 @@
     }
   ],
   "minServerVersion": "2.6",
+  "serverless": "forbid",
   "tests": [
     {
       "description": "Aggregate with $out",
diff --git a/test/crud/v1/read/count-collation.json b/test/crud/v1/read/count-collation.json
@@ -6,6 +6,7 @@
     }
   ],
   "minServerVersion": "3.4",
+  "serverless": "forbid",
   "tests": [
     {
       "description": "Count documents with collation",
diff --git a/test/crud/v1/read/distinct-collation.json b/test/crud/v1/read/distinct-collation.json
@@ -10,6 +10,7 @@
     }
   ],
   "minServerVersion": "3.4",
+  "serverless": "forbid",
   "tests": [
     {
       "description": "Distinct with a collation",
diff --git a/test/crud/v1/read/find-collation.json b/test/crud/v1/read/find-collation.json
@@ -6,6 +6,7 @@
     }
   ],
   "minServerVersion": "3.4",
+  "serverless": "forbid",
   "tests": [
     {
       "description": "Find with a collation",
diff --git a/test/crud/v1/write/bulkWrite-collation.json b/test/crud/v1/write/bulkWrite-collation.json
@@ -22,6 +22,7 @@
     }
   ],
   "minServerVersion": "3.4",
+  "serverless": "forbid",
   "tests": [
     {
       "description": "BulkWrite with delete operations and collation",
diff --git a/test/crud/v1/write/deleteMany-collation.json b/test/crud/v1/write/deleteMany-collation.json
@@ -14,6 +14,7 @@
     }
   ],
   "minServerVersion": "3.4",
+  "serverless": "forbid",
   "tests": [
     {
       "description": "DeleteMany when many documents match with collation",
diff --git a/test/crud/v1/write/deleteOne-collation.json b/test/crud/v1/write/deleteOne-collation.json
@@ -14,6 +14,7 @@
     }
   ],
   "minServerVersion": "3.4",
+  "serverless": "forbid",
   "tests": [
     {
       "description": "DeleteOne when many documents matches with collation",
diff --git a/test/crud/v1/write/findOneAndDelete-collation.json b/test/crud/v1/write/findOneAndDelete-collation.json
@@ -14,6 +14,7 @@
     }
   ],
   "minServerVersion": "3.4",
+  "serverless": "forbid",
   "tests": [
     {
       "description": "FindOneAndDelete when one document matches with collation",
diff --git a/test/crud/v1/write/findOneAndReplace-collation.json b/test/crud/v1/write/findOneAndReplace-collation.json
@@ -10,6 +10,7 @@
     }
   ],
   "minServerVersion": "3.4",
+  "serverless": "forbid",
   "tests": [
     {
       "description": "FindOneAndReplace when one document matches with collation returning the document after modification",
diff --git a/test/crud/v1/write/findOneAndUpdate-collation.json b/test/crud/v1/write/findOneAndUpdate-collation.json
@@ -14,6 +14,7 @@
     }
   ],
   "minServerVersion": "3.4",
+  "serverless": "forbid",
   "tests": [
     {
       "description": "FindOneAndUpdate when many documents match with collation returning the document before modification",
diff --git a/test/crud/v1/write/replaceOne-collation.json b/test/crud/v1/write/replaceOne-collation.json
@@ -10,6 +10,7 @@
     }
   ],
   "minServerVersion": "3.4",
+  "serverless": "forbid",
   "tests": [
     {
       "description": "ReplaceOne when one document matches with collation",
diff --git a/test/crud/v1/write/updateMany-collation.json b/test/crud/v1/write/updateMany-collation.json
@@ -14,6 +14,7 @@
     }
   ],
   "minServerVersion": "3.4",
+  "serverless": "forbid",
   "tests": [
     {
       "description": "UpdateMany when many documents match with collation",
diff --git a/test/crud/v1/write/updateOne-collation.json b/test/crud/v1/write/updateOne-collation.json
@@ -10,6 +10,7 @@
     }
   ],
   "minServerVersion": "3.4",
+  "serverless": "forbid",
   "tests": [
     {
       "description": "UpdateOne when one document matches with collation",
diff --git a/test/test_crud_v1.py b/test/test_crud_v1.py
@@ -133,16 +133,13 @@ def run_operation(collection, test):
 
 def maybe_skip_test(self, test):
     """Skip tests that use features not supported by MongoDB serverless."""
-    if not client_context.serverless:
-        return
-
-    if test['operation']['name'] == 'aggregate':
-        for stage in test['operation']['arguments']['pipeline']:
-            if "$out" in stage:
-                self.skipTest("MongoDB Serverless does not support $out")
-
-    if "collation" in test['operation']['arguments']:
-        self.skipTest("MongoDB Serverless does not support collations")
+    serverless = test.get('serverless')
+    if serverless == "require":
+        if not client_context.serverless:
+            self.skipTest("This test requires MongoDB serverless")
+    elif serverless == "forbid":
+        if client_context.serverless:
+            self.skipTest("This test does not support MongoDB serverless")
 
 
 def create_test(scenario_def, test, name):

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`}`
`7`	`7`	`],`
`8`	`8`	`"minServerVersion": "3.4",`
	`9`	`+ "serverless": "forbid",`
`9`	`10`	`"tests": [`
`10`	`11`	`{`
`11`	`12`	`"description": "Aggregate with collation",`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`}`
`15`	`15`	`],`
`16`	`16`	`"minServerVersion": "2.6",`
	`17`	`+ "serverless": "forbid",`
`17`	`18`	`"tests": [`
`18`	`19`	`{`
`19`	`20`	`"description": "Aggregate with $out",`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"minServerVersion": "3.4",`
	`13`	`+ "serverless": "forbid",`
`13`	`14`	`"tests": [`
`14`	`15`	`{`
`15`	`16`	`"description": "Distinct with a collation",`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`}`
`23`	`23`	`],`
`24`	`24`	`"minServerVersion": "3.4",`
	`25`	`+ "serverless": "forbid",`
`25`	`26`	`"tests": [`
`26`	`27`	`{`
`27`	`28`	`"description": "BulkWrite with delete operations and collation",`