minor: sync versioned api spec tests

Author: saghm

src/test/spec/json/versioned-api/README.rst

@@ -0,0 +1,37 @@
+===================
+Versioned API Tests
+===================
+
+.. contents::
+
+----
+
+Notes
+=====
+
+This directory contains tests for the Versioned API specification. They are
+implemented in the `Unified Test Format <../../unified-test-format/unified-test-format.rst>`__,
+and require schema version 1.1. Note that to run these tests, the server must be
+started with both ``enableTestCommands`` and ``acceptAPIVersion2`` parameters
+set to true.
+
+Testing with required API version
+=================================
+
+Drivers MUST run their test suite against a cluster with the
+``requireApiVersion`` parameter enabled and also requires authentication.
+
+To run this test, proceed as follows:
+- Start a standalone mongod instance
+
+- Connect to the standalone instance and run the following command on the
+  ``admin`` database: ``{ setParameter: 1, requireApiVersion: true }``
+
+- Declare an API version for the test run through the ``MONGODB_API_VERSION``
+  environment variable.
+
+- If the environment variable is set, all clients created in tests MUST declare
+  the ``ServerApiVersion`` specified.
+
+No other topologies must be tested until ``mongo-orchestration`` can handle
+servers with ``requireApiVersion`` enabled.

src/test/spec/json/versioned-api/crud-api-version-1-strict.json

@@ -3,7 +3,7 @@
   "schemaVersion": "1.1",
   "runOnRequirements": [
     {
-      "minServerVersion": "4.7"
+      "minServerVersion": "4.9"
     }
   ],
   "createEntities": [
@@ -154,6 +154,9 @@
                 "$limit": 1
               }
             ]
+          },
+          "expectError": {
+            "errorCodeName": "APIStrictError"
           }
         }
       ],
@@ -298,6 +301,12 @@
                         "$inc": {
                           "x": 1
                         }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
                       }
                     }
                   ],
@@ -350,7 +359,10 @@
                           "x": 1
                         }
                       },
-                      "multi": true
+                      "multi": true,
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
                     }
                   ],
                   "apiVersion": "1",
@@ -394,6 +406,9 @@
                         "_id": 4,
                         "x": 44
                       },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
                       "upsert": true
                     }
                   ],
@@ -607,7 +622,22 @@
             {
               "commandStartedEvent": {
                 "command": {
-                  "count": "test",
+                  "aggregate": "test",
+                  "pipeline": [
+                    {
+                      "$collStats": {
+                        "count": {}
+                      }
+                    },
+                    {
+                      "$group": {
+                        "_id": 1,
+                        "n": {
+                          "$sum": "$count"
+                        }
+                      }
+                    }
+                  ],
                   "apiVersion": "1",
                   "apiStrict": true,
                   "apiDeprecationErrors": {
@@ -948,6 +978,9 @@
                         "_id": 4,
                         "x": 44
                       },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
                       "upsert": true
                     }
                   ],
@@ -1003,7 +1036,10 @@
                           "x": 1
                         }
                       },
-                      "multi": true
+                      "multi": true,
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
                     }
                   ],
                   "apiVersion": "1",
@@ -1053,6 +1089,12 @@
                         "$inc": {
                           "x": 1
                         }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
                       }
                     }
                   ],