chore: sync retryable reads tests for listIndex changes

NODE-2266
mongodb · Jul 10, 2020 · eff550d · eff550d
1 parent d50ab53
commit eff550d
Show file tree

Hide file tree

Showing 17 changed files with 84 additions and 233 deletions.
diff --git a/test/spec/retryable-reads/README.rst b/test/spec/retryable-reads/README.rst
@@ -84,7 +84,10 @@ Each YAML file has the following keys:
 - ``bucket_name``: Optional. The GridFS bucket name to use for testing.
 
 - ``data``: The data that should exist in the collection(s) under test before
-  each test run.
+  each test run. This will typically be an array of documents to be inserted
+  into the collection under test (i.e. ``collection_name``); however, this field
+  may also be an object mapping collection names to arrays of documents to be
+  inserted into the specified collection.
 
 - ``tests``: An array of tests that are to be run independently of each other.
   Each test will have some or all of the following fields:
@@ -126,6 +129,9 @@ GridFS Tests
 ------------
 
 GridFS tests are denoted by when the YAML file contains ``bucket_name``.
+The ``data`` field will also be an object, which maps collection names
+(e.g. ``fs.files``) to an array of documents that should be inserted into
+the specified collection.
 
 ``fs.files`` and ``fs.chunks`` should be created in the database
 specified by ``database_name``. This could be done via inserts or by

diff --git a/test/spec/retryable-reads/aggregate-merge.json b/test/spec/retryable-reads/aggregate-merge.json
@@ -1,7 +1,7 @@
 {
   "runOn": [
     {
-      "minServerVersion": "4.2.0"
+      "minServerVersion": "4.1.11"
     }
   ],
   "database_name": "retryable-reads-tests",

diff --git a/test/spec/retryable-reads/aggregate-merge.yml b/test/spec/retryable-reads/aggregate-merge.yml
@@ -1,6 +1,6 @@
 runOn:
   -
-    minServerVersion: "4.2.0"
+    minServerVersion: "4.1.11"
 
 database_name: &database_name "retryable-reads-tests"
 collection_name: &collection_name "coll"

diff --git a/test/spec/retryable-reads/changeStreams-client.watch-serverErrors.json b/test/spec/retryable-reads/changeStreams-client.watch-serverErrors.json
@@ -59,7 +59,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -76,7 +75,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -116,7 +114,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -133,7 +130,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -173,7 +169,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -190,7 +185,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -230,7 +224,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -247,7 +240,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -287,7 +279,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -304,7 +295,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -344,7 +334,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -361,7 +350,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -401,7 +389,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -418,7 +405,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -458,7 +444,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -475,7 +460,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -515,7 +499,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -532,7 +515,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -572,7 +554,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -589,7 +570,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -629,7 +609,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -646,7 +625,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -687,7 +665,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -704,7 +681,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -748,7 +724,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }

diff --git a/test/spec/retryable-reads/changeStreams-client.watch-serverErrors.yml b/test/spec/retryable-reads/changeStreams-client.watch-serverErrors.yml
@@ -31,7 +31,7 @@ tests:
                     command:
                         aggregate: 1
                         cursor: {}
-                        pipeline: [ { $changeStream: { fullDocument: "default", allChangesForCluster: true } } ]
+                        pipeline: [ { $changeStream: { allChangesForCluster: true } } ]
                     database_name: admin
             - *retryable_command_started_event
     -

diff --git a/test/spec/retryable-reads/changeStreams-client.watch.json b/test/spec/retryable-reads/changeStreams-client.watch.json
@@ -39,7 +39,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -79,7 +78,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -96,7 +94,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -140,7 +137,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -181,7 +177,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }
@@ -198,7 +193,6 @@
               "pipeline": [
                 {
                   "$changeStream": {
-                    "fullDocument": "default",
                     "allChangesForCluster": true
                   }
                 }

diff --git a/test/spec/retryable-reads/changeStreams-client.watch.yml b/test/spec/retryable-reads/changeStreams-client.watch.yml
@@ -25,7 +25,7 @@ tests:
                     command:
                         aggregate: 1
                         cursor: {}
-                        pipeline: [ { $changeStream: { fullDocument: "default", "allChangesForCluster": true } } ]
+                        pipeline: [ { $changeStream: { "allChangesForCluster": true } } ]
                     database_name: admin
     -
         description: "client.watch succeeds on second attempt"