From 63f378c6cc30e4d72b0ae511b457dbb25f3b915b Mon Sep 17 00:00:00 2001
From: Durran Jordan <durran@gmail.com>
Date: Tue, 7 Dec 2021 15:27:25 +0100
Subject: [PATCH 1/6] test(NODE-3713): skip failing evergreen tests

---
 .evergreen/config.yml                                     | 4 ++--
 .evergreen/config.yml.in                                  | 4 ++--
 test/functional/connections_stepdown.test.js              | 2 +-
 test/functional/cursorstream.test.js                      | 3 ++-
 test/functional/examples/change_streams.test.js           | 3 ++-
 test/functional/find.test.js                              | 2 +-
 test/functional/unit-sdam/monitoring.test.js              | 3 ++-
 test/integration/read-write-concern/write_concern.test.js | 3 ++-
 test/manual/kerberos.test.js                              | 4 ++--
 9 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 074824c2ba5..ad682113dcc 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -118,7 +118,7 @@ functions:
       type: test
       params:
         working_dir: src
-        timeout_secs: 60
+        timeout_secs: 300
         script: |
           ${PREPARE_SHELL}
 
@@ -186,7 +186,7 @@ functions:
       type: test
       params:
         working_dir: src
-        timeout_secs: 60
+        timeout_secs: 300
         script: |
           ${PREPARE_SHELL}
 
diff --git a/.evergreen/config.yml.in b/.evergreen/config.yml.in
index 4932d90de77..5aca7f116d0 100644
--- a/.evergreen/config.yml.in
+++ b/.evergreen/config.yml.in
@@ -138,7 +138,7 @@ functions:
       type: test
       params:
         working_dir: "src"
-        timeout_secs: 60
+        timeout_secs: 300
         script: |
           ${PREPARE_SHELL}
 
@@ -210,7 +210,7 @@ functions:
       type: test
       params:
         working_dir: src
-        timeout_secs: 60
+        timeout_secs: 300
         script: |
           ${PREPARE_SHELL}
 
diff --git a/test/functional/connections_stepdown.test.js b/test/functional/connections_stepdown.test.js
index 14cef7b92cd..576c2ae5fb4 100644
--- a/test/functional/connections_stepdown.test.js
+++ b/test/functional/connections_stepdown.test.js
@@ -26,7 +26,7 @@ function expectPoolWasNotCleared(initialCount) {
   return count => expect(count).to.equal(initialCount);
 }
 
-describe('Connections survive primary step down', function () {
+describe.skip('Connections survive primary step down', function () {
   let client;
   let checkClient;
   let db;
diff --git a/test/functional/cursorstream.test.js b/test/functional/cursorstream.test.js
index 4d6d028a59d..412e1262174 100644
--- a/test/functional/cursorstream.test.js
+++ b/test/functional/cursorstream.test.js
@@ -207,7 +207,8 @@ describe('Cursor Streams', function () {
     }
   });
 
-  it('should stream documents across getMore command and count correctly', {
+  // Fails on MacOS on Evergreen (NODE-3713)
+  it.skip('should stream documents across getMore command and count correctly', {
     metadata: {
       requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] }
     },
diff --git a/test/functional/examples/change_streams.test.js b/test/functional/examples/change_streams.test.js
index 9e9ca4ecb6c..4c547e2dba7 100644
--- a/test/functional/examples/change_streams.test.js
+++ b/test/functional/examples/change_streams.test.js
@@ -4,7 +4,8 @@
 const setupDatabase = require('../shared').setupDatabase;
 const expect = require('chai').expect;
 
-describe('examples(change-stream):', function () {
+// Fails on MacOS on Evergreen (NODE-3713)
+describe.skip('examples(change-stream):', function () {
   let client;
   let db;
 
diff --git a/test/functional/find.test.js b/test/functional/find.test.js
index c4c04969f4e..30d909d7e58 100644
--- a/test/functional/find.test.js
+++ b/test/functional/find.test.js
@@ -1655,7 +1655,7 @@ describe('Find', function () {
     }
   });
 
-  it('shouldCorrectlyIterateOverCollection', {
+  it.skip('shouldCorrectlyIterateOverCollection', {
     metadata: {
       requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] }
     },
diff --git a/test/functional/unit-sdam/monitoring.test.js b/test/functional/unit-sdam/monitoring.test.js
index 3ff87fcd447..a3a2fb1928c 100644
--- a/test/functional/unit-sdam/monitoring.test.js
+++ b/test/functional/unit-sdam/monitoring.test.js
@@ -24,7 +24,8 @@ describe('monitoring', function () {
     return mock.createServer().then(server => (mockServer = server));
   });
 
-  it('should record roundTripTime', function (done) {
+  // Fails on MacOS on Evergreen (NODE-3713)
+  it.skip('should record roundTripTime', function (done) {
     mockServer.setMessageHandler(request => {
       const doc = request.document;
       if (isHello(doc)) {
diff --git a/test/integration/read-write-concern/write_concern.test.js b/test/integration/read-write-concern/write_concern.test.js
index 8f207bf822e..fdf811064bd 100644
--- a/test/integration/read-write-concern/write_concern.test.js
+++ b/test/integration/read-write-concern/write_concern.test.js
@@ -82,7 +82,8 @@ describe('Write Concern', function () {
 
     after(() => mock.cleanup());
 
-    it('should pipe writeConcern from client down to API call', function () {
+    // TODO: NODE-3816
+    it.skip('should pipe writeConcern from client down to API call', function () {
       server.setMessageHandler(request => {
         if (request.document && request.document[LEGACY_HELLO_COMMAND]) {
           return request.reply(mock.HELLO);
diff --git a/test/manual/kerberos.test.js b/test/manual/kerberos.test.js
index a2e5f139a41..32764d19f07 100644
--- a/test/manual/kerberos.test.js
+++ b/test/manual/kerberos.test.js
@@ -72,7 +72,7 @@ describe('Kerberos', function () {
       client.connect(function (err) {
         expect(err).to.exist;
         expect(err.message).to.match(
-          /(Error from KDC: LOOKING_UP_SERVER)|(not found in Kerberos database)/
+          /(Error from KDC: LOOKING_UP_SERVER)|(not found in Kerberos database)|(UNKNOWN_SERVER)/
         );
         done();
       });
@@ -85,7 +85,7 @@ describe('Kerberos', function () {
       client.connect(function (err) {
         expect(err).to.exist;
         expect(err.message).to.match(
-          /(Error from KDC: LOOKING_UP_SERVER)|(not found in Kerberos database)/
+          /(Error from KDC: LOOKING_UP_SERVER)|(not found in Kerberos database)|(UNKNOWN_SERVER)/
         );
         done();
       });

From 51f8d1c43d32c416011116bf04265dc9ecb33691 Mon Sep 17 00:00:00 2001
From: Durran Jordan <durran@gmail.com>
Date: Thu, 16 Dec 2021 10:57:10 +0100
Subject: [PATCH 2/6] test(NODE-3713): adding todo comments for skipped tests

---
 test/functional/connections_stepdown.test.js    | 1 +
 test/functional/cursorstream.test.js            | 2 +-
 test/functional/examples/change_streams.test.js | 2 +-
 test/functional/find.test.js                    | 1 +
 test/functional/unit-sdam/monitoring.test.js    | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/functional/connections_stepdown.test.js b/test/functional/connections_stepdown.test.js
index 576c2ae5fb4..d6134ab3afe 100644
--- a/test/functional/connections_stepdown.test.js
+++ b/test/functional/connections_stepdown.test.js
@@ -26,6 +26,7 @@ function expectPoolWasNotCleared(initialCount) {
   return count => expect(count).to.equal(initialCount);
 }
 
+// TODO: NODE-3819: Unskip flaky MacOS tests.
 describe.skip('Connections survive primary step down', function () {
   let client;
   let checkClient;
diff --git a/test/functional/cursorstream.test.js b/test/functional/cursorstream.test.js
index 412e1262174..0424132c194 100644
--- a/test/functional/cursorstream.test.js
+++ b/test/functional/cursorstream.test.js
@@ -207,7 +207,7 @@ describe('Cursor Streams', function () {
     }
   });
 
-  // Fails on MacOS on Evergreen (NODE-3713)
+  // TODO: NODE-3819: Unskip flaky MacOS tests.
   it.skip('should stream documents across getMore command and count correctly', {
     metadata: {
       requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] }
diff --git a/test/functional/examples/change_streams.test.js b/test/functional/examples/change_streams.test.js
index 4c547e2dba7..0494803900b 100644
--- a/test/functional/examples/change_streams.test.js
+++ b/test/functional/examples/change_streams.test.js
@@ -4,7 +4,7 @@
 const setupDatabase = require('../shared').setupDatabase;
 const expect = require('chai').expect;
 
-// Fails on MacOS on Evergreen (NODE-3713)
+// TODO: NODE-3819: Unskip flaky MacOS tests.
 describe.skip('examples(change-stream):', function () {
   let client;
   let db;
diff --git a/test/functional/find.test.js b/test/functional/find.test.js
index 30d909d7e58..a514ff33817 100644
--- a/test/functional/find.test.js
+++ b/test/functional/find.test.js
@@ -1655,6 +1655,7 @@ describe('Find', function () {
     }
   });
 
+  // TODO: NODE-3819: Unskip flaky MacOS tests.
   it.skip('shouldCorrectlyIterateOverCollection', {
     metadata: {
       requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] }
diff --git a/test/functional/unit-sdam/monitoring.test.js b/test/functional/unit-sdam/monitoring.test.js
index a3a2fb1928c..30ae2b72629 100644
--- a/test/functional/unit-sdam/monitoring.test.js
+++ b/test/functional/unit-sdam/monitoring.test.js
@@ -24,7 +24,7 @@ describe('monitoring', function () {
     return mock.createServer().then(server => (mockServer = server));
   });
 
-  // Fails on MacOS on Evergreen (NODE-3713)
+  // TODO: NODE-3819: Unskip flaky MacOS tests.
   it.skip('should record roundTripTime', function (done) {
     mockServer.setMessageHandler(request => {
       const doc = request.document;

From 03f5eaefd905753756b2cc611d2d1421146d1ead Mon Sep 17 00:00:00 2001
From: Durran Jordan <durran@gmail.com>
Date: Thu, 16 Dec 2021 11:22:43 +0100
Subject: [PATCH 3/6] test(NODE-3713): check csfle node install

---
 .evergreen/run-tests.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
index b1f0dd96883..6daf5863b48 100755
--- a/.evergreen/run-tests.sh
+++ b/.evergreen/run-tests.sh
@@ -41,7 +41,9 @@ if [[ -z "${CLIENT_ENCRYPTION}" ]]; then
   unset AWS_ACCESS_KEY_ID;
   unset AWS_SECRET_ACCESS_KEY;
 else
-  npm install mongodb-client-encryption@">=2.0.0-beta.0"
+  if [[ ! -d ${PROJECT_DIRECTORY}/node_modules/mongodb-client-encryption ]]; then
+    npm install mongodb-client-encryption@">=2.0.0-beta.0"
+  fi
   pip install --upgrade boto3
 
   # Get access to the AWS temporary credentials:

From 5c30d1c20bdefbbc02979a69bc8fb42556b53b19 Mon Sep 17 00:00:00 2001
From: Durran Jordan <durran@gmail.com>
Date: Thu, 16 Dec 2021 12:21:12 +0100
Subject: [PATCH 4/6] Revert "test(NODE-3713): check csfle node install"

This reverts commit 5fc39afdba2e622213e180bbe127155cfa3e384b.
---
 .evergreen/run-tests.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
index 6daf5863b48..b1f0dd96883 100755
--- a/.evergreen/run-tests.sh
+++ b/.evergreen/run-tests.sh
@@ -41,9 +41,7 @@ if [[ -z "${CLIENT_ENCRYPTION}" ]]; then
   unset AWS_ACCESS_KEY_ID;
   unset AWS_SECRET_ACCESS_KEY;
 else
-  if [[ ! -d ${PROJECT_DIRECTORY}/node_modules/mongodb-client-encryption ]]; then
-    npm install mongodb-client-encryption@">=2.0.0-beta.0"
-  fi
+  npm install mongodb-client-encryption@">=2.0.0-beta.0"
   pip install --upgrade boto3
 
   # Get access to the AWS temporary credentials:

From b20cae8407fa9b8e4a090ed43cf40236caa91444 Mon Sep 17 00:00:00 2001
From: Durran Jordan <durran@gmail.com>
Date: Fri, 17 Dec 2021 05:37:55 +0100
Subject: [PATCH 5/6] test(NODE-3713): specifically skip on macos

---
 test/functional/connections_stepdown.test.js    | 3 ++-
 test/functional/cursorstream.test.js            | 3 ++-
 test/functional/examples/change_streams.test.js | 5 +++--
 test/functional/find.test.js                    | 2 +-
 test/functional/unit-sdam/monitoring.test.js    | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/test/functional/connections_stepdown.test.js b/test/functional/connections_stepdown.test.js
index d6134ab3afe..6164e2c2f7a 100644
--- a/test/functional/connections_stepdown.test.js
+++ b/test/functional/connections_stepdown.test.js
@@ -27,7 +27,8 @@ function expectPoolWasNotCleared(initialCount) {
 }
 
 // TODO: NODE-3819: Unskip flaky MacOS tests.
-describe.skip('Connections survive primary step down', function () {
+const maybeDescribe = process.platform === 'darwin' ? describe.skip : describe;
+maybeDescribe('Connections survive primary step down', function () {
   let client;
   let checkClient;
   let db;
diff --git a/test/functional/cursorstream.test.js b/test/functional/cursorstream.test.js
index 0424132c194..2667a953dfd 100644
--- a/test/functional/cursorstream.test.js
+++ b/test/functional/cursorstream.test.js
@@ -208,7 +208,8 @@ describe('Cursor Streams', function () {
   });
 
   // TODO: NODE-3819: Unskip flaky MacOS tests.
-  it.skip('should stream documents across getMore command and count correctly', {
+  const maybeIt = process.platform === 'darwin' ? it.skip : it;
+  maybeIt('should stream documents across getMore command and count correctly', {
     metadata: {
       requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] }
     },
diff --git a/test/functional/examples/change_streams.test.js b/test/functional/examples/change_streams.test.js
index 0494803900b..8acb5fa5862 100644
--- a/test/functional/examples/change_streams.test.js
+++ b/test/functional/examples/change_streams.test.js
@@ -4,8 +4,9 @@
 const setupDatabase = require('../shared').setupDatabase;
 const expect = require('chai').expect;
 
-// TODO: NODE-3819: Unskip flaky MacOS tests.
-describe.skip('examples(change-stream):', function () {
+// TODO: NODE-3819: Unskip flaky MacOS/Windows tests.
+const maybeDescribe = process.platform !== 'linux' ? describe.skip : describe;
+maybeDescribe('examples(change-stream):', function () {
   let client;
   let db;
 
diff --git a/test/functional/find.test.js b/test/functional/find.test.js
index a514ff33817..c337a0f766f 100644
--- a/test/functional/find.test.js
+++ b/test/functional/find.test.js
@@ -1655,7 +1655,7 @@ describe('Find', function () {
     }
   });
 
-  // TODO: NODE-3819: Unskip flaky MacOS tests.
+  // TODO: NODE-3819: Unskip flaky tests.
   it.skip('shouldCorrectlyIterateOverCollection', {
     metadata: {
       requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] }
diff --git a/test/functional/unit-sdam/monitoring.test.js b/test/functional/unit-sdam/monitoring.test.js
index 30ae2b72629..51197b2abbf 100644
--- a/test/functional/unit-sdam/monitoring.test.js
+++ b/test/functional/unit-sdam/monitoring.test.js
@@ -24,7 +24,7 @@ describe('monitoring', function () {
     return mock.createServer().then(server => (mockServer = server));
   });
 
-  // TODO: NODE-3819: Unskip flaky MacOS tests.
+  // TODO: NODE-3819: Unskip flaky tests.
   it.skip('should record roundTripTime', function (done) {
     mockServer.setMessageHandler(request => {
       const doc = request.document;

From b886e153cf4f118c48e5a63472355bb7e6a4e279 Mon Sep 17 00:00:00 2001
From: Durran Jordan <durran@gmail.com>
Date: Fri, 17 Dec 2021 14:15:21 +0100
Subject: [PATCH 6/6] test(NODE-3713): fix tests after rebase

---
 test/integration/change-streams/change_stream.test.js       | 4 +++-
 test/integration/change-streams/change_streams.spec.test.js | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/integration/change-streams/change_stream.test.js b/test/integration/change-streams/change_stream.test.js
index e60c1bbf202..73eb552a1e0 100644
--- a/test/integration/change-streams/change_stream.test.js
+++ b/test/integration/change-streams/change_stream.test.js
@@ -509,7 +509,9 @@ describe('Change Streams', function () {
     }
   });
 
-  it('should cache the change stream resume token using promises', {
+  // TODO: NODE-3819: Unskip flaky MacOS tests.
+  const maybeIt = process.platform === 'darwin' ? it.skip : it;
+  maybeIt('should cache the change stream resume token using promises', {
     metadata: { requires: { topology: 'replicaset', mongodb: '>=3.6' } },
     test: function () {
       const configuration = this.configuration;
diff --git a/test/integration/change-streams/change_streams.spec.test.js b/test/integration/change-streams/change_streams.spec.test.js
index 82f54ffd6d7..436e7f493f5 100644
--- a/test/integration/change-streams/change_streams.spec.test.js
+++ b/test/integration/change-streams/change_streams.spec.test.js
@@ -12,7 +12,9 @@ describe('Change Streams Spec - Unified', function () {
   runUnifiedSuite(loadSpecTests(path.join('change-streams', 'unified')));
 });
 
-describe('Change Stream Spec - v1', function () {
+// TODO: NODE-3819: Unskip flaky MacOS tests.
+const maybeDescribe = process.platform === 'darwin' ? describe.skip : describe;
+maybeDescribe('Change Stream Spec - v1', function () {
   let globalClient;
   let ctx;
   let events;