test(NODE-3076): run unified change stream tests (#2914)

Author: emadum

test/functional/change_stream_spec.test.js

@@ -2,13 +2,18 @@
 
 const path = require('path');
 const chai = require('chai');
-const loadSpecTests = require('../spec').loadSpecTests;
+const { loadSpecTests } = require('../spec');
+const { runUnifiedSuite } = require('./unified-spec-runner/runner');
 const camelCase = require('lodash.camelcase');
-const setupDatabase = require('./shared').setupDatabase;
-const delay = require('./shared').delay;
+const { setupDatabase } = require('./shared');
+const { delay } = require('./shared');
 const expect = chai.expect;
 
-describe('Change Stream Spec', function () {
+describe('Change Streams Spec - Unified', function () {
+  runUnifiedSuite(loadSpecTests(path.join('change-streams', 'unified')));
+});
+
+describe('Change Stream Spec - v1', function () {
   let globalClient;
   let ctx;
   let events;
@@ -29,7 +34,7 @@ describe('Change Stream Spec', function () {
     return new Promise(r => gc.close(() => r()));
   });
 
-  loadSpecTests(path.join('change-stream', 'legacy')).forEach(suite => {
+  loadSpecTests(path.join('change-streams', 'legacy')).forEach(suite => {
     const ALL_DBS = [suite.database_name, suite.database2_name];
 
     describe(suite.name, () => {

test/spec/change-stream/README.rst renamed to test/spec/change-streams/README.rst

@@ -81,7 +81,7 @@ tests:
       mode: { times: 1 }
       data:
           failCommands: ["getMore"]
-          errorCode: 216 # An error code that's not on the old blacklist or whitelist
+          errorCode: 216 # An error code that's not on the old deny or allow lists
           closeConnection: false
     target: collection
     topology:

test/spec/change-stream/legacy/change-streams-errors.json renamed to test/spec/change-streams/legacy/change-streams-errors.json

@@ -778,7 +778,7 @@
       }
     },
     {
-      "description": "change stream resumes after NotMaster",
+      "description": "change stream resumes after NotWritablePrimary",
       "minServerVersion": "4.2",
       "maxServerVersion": "4.2.99",
       "failPoint": {
@@ -1069,7 +1069,7 @@
       }
     },
     {
-      "description": "change stream resumes after NotMasterNoSlaveOk",
+      "description": "change stream resumes after NotPrimaryNoSecondaryOk",
       "minServerVersion": "4.2",
       "maxServerVersion": "4.2.99",
       "failPoint": {
@@ -1166,7 +1166,7 @@
       }
     },
     {
-      "description": "change stream resumes after NotMasterOrSecondary",
+      "description": "change stream resumes after NotPrimaryOrSecondary",
       "minServerVersion": "4.2",
       "maxServerVersion": "4.2.99",
       "failPoint": {

test/spec/change-stream/legacy/change-streams-errors.yml renamed to test/spec/change-streams/legacy/change-streams-errors.yml

@@ -522,7 +522,7 @@ tests:
             x:
               $numberInt: "1"
   -
-    description: "change stream resumes after NotMaster"
+    description: "change stream resumes after NotWritablePrimary"
     minServerVersion: "4.2"
     maxServerVersion: "4.2.99"
     failPoint:
@@ -717,7 +717,7 @@ tests:
             x:
               $numberInt: "1"
   -
-    description: "change stream resumes after NotMasterNoSlaveOk"
+    description: "change stream resumes after NotPrimaryNoSecondaryOk"
     minServerVersion: "4.2"
     maxServerVersion: "4.2.99"
     failPoint:
@@ -782,7 +782,7 @@ tests:
             x:
               $numberInt: "1"
   -
-    description: "change stream resumes after NotMasterOrSecondary"
+    description: "change stream resumes after NotPrimaryOrSecondary"
     minServerVersion: "4.2"
     maxServerVersion: "4.2.99"
     failPoint:

test/spec/change-stream/legacy/change-streams-resume-whitelist.json renamed to test/spec/change-streams/legacy/change-streams-resume-allowlist.json

@@ -661,7 +661,7 @@
       }
     },
     {
-      "description": "change stream resumes after NotMaster",
+      "description": "change stream resumes after NotWritablePrimary",
       "minServerVersion": "4.3.1",
       "failPoint": {
         "configureFailPoint": "failGetMoreAfterCursorCheckout",
@@ -943,7 +943,7 @@
       }
     },
     {
-      "description": "change stream resumes after NotMasterNoSlaveOk",
+      "description": "change stream resumes after NotPrimaryNoSecondaryOk",
       "minServerVersion": "4.3.1",
       "failPoint": {
         "configureFailPoint": "failGetMoreAfterCursorCheckout",
@@ -1037,7 +1037,7 @@
       }
     },
     {
-      "description": "change stream resumes after NotMasterOrSecondary",
+      "description": "change stream resumes after NotPrimaryOrSecondary",
       "minServerVersion": "4.3.1",
       "failPoint": {
         "configureFailPoint": "failGetMoreAfterCursorCheckout",

test/spec/change-stream/legacy/change-streams-resume-whitelist.yml renamed to test/spec/change-streams/legacy/change-streams-resume-allowlist.yml

@@ -451,7 +451,7 @@ tests:
             x:
               $numberInt: "1"
   -
-    description: "change stream resumes after NotMaster"
+    description: "change stream resumes after NotWritablePrimary"
     minServerVersion: "4.3.1"
     failPoint:
       configureFailPoint: failGetMoreAfterCursorCheckout
@@ -643,7 +643,7 @@ tests:
             x:
               $numberInt: "1"
   -
-    description: "change stream resumes after NotMasterNoSlaveOk"
+    description: "change stream resumes after NotPrimaryNoSecondaryOk"
     minServerVersion: "4.3.1"
     failPoint:
       configureFailPoint: failGetMoreAfterCursorCheckout
@@ -707,7 +707,7 @@ tests:
             x:
               $numberInt: "1"
   -
-    description: "change stream resumes after NotMasterOrSecondary"
+    description: "change stream resumes after NotPrimaryOrSecondary"
     minServerVersion: "4.3.1"
     failPoint:
       configureFailPoint: failGetMoreAfterCursorCheckout
@@ -1026,7 +1026,7 @@ tests:
           fullDocument:
             x:
               $numberInt: "1"
-  # The next two tests ensure that the driver only uses the error label, not the whitelist.
+  # The next two tests ensure that the driver only uses the error label, not the allow list.
   -
     description: "change stream resumes if error contains ResumableChangeStreamError"
     minServerVersion: "4.3.1"
@@ -1035,7 +1035,7 @@ tests:
       mode: { times: 1 }
       data:
           failCommands: ["getMore"]
-          errorCode: 50 # Use an error code that does not have the whitelist label by default
+          errorCode: 50 # Use an error code that does not have the allow list label by default
           closeConnection: false
           errorLabels: ["ResumableChangeStreamError"]
     target: collection
@@ -1097,11 +1097,11 @@ tests:
     description: "change stream does not resume if error does not contain ResumableChangeStreamError"
     minServerVersion: "4.3.1"
     failPoint:
-      configureFailPoint: failCommand # failCommand will not add the whitelist error label
+      configureFailPoint: failCommand # failCommand will not add the allow list error label
       mode: { times: 1 }
       data:
           failCommands: ["getMore"]
-          errorCode: 6 # Use an error code that is on the whitelist
+          errorCode: 6 # Use an error code that is on the allow list
           closeConnection: false
     target: collection
     topology: