review feedback

Author: emadum

.evergreen/config.yml

@@ -1,6 +1,6 @@
 stepback: true
 command_type: system
-exec_timeout_secs: 1200
+exec_timeout_secs: 1500
 timeout:
   - command: shell.exec
     params:
@@ -499,39 +499,6 @@ post:
 ignore:
   - '*.md'
 tasks:
-  - name: test-latest-server
-    tags:
-      - latest
-      - server
-    commands:
-      - func: install dependencies
-      - func: bootstrap mongo-orchestration
-        vars:
-          VERSION: latest
-          TOPOLOGY: server
-      - func: run tests
-  - name: test-latest-replica_set
-    tags:
-      - latest
-      - replica_set
-    commands:
-      - func: install dependencies
-      - func: bootstrap mongo-orchestration
-        vars:
-          VERSION: latest
-          TOPOLOGY: replica_set
-      - func: run tests
-  - name: test-latest-sharded_cluster
-    tags:
-      - latest
-      - sharded_cluster
-    commands:
-      - func: install dependencies
-      - func: bootstrap mongo-orchestration
-        vars:
-          VERSION: latest
-          TOPOLOGY: sharded_cluster
-      - func: run tests
   - name: test-latest-server-unified
     tags:
       - latest
@@ -1582,9 +1549,6 @@ buildvariants:
     expansions:
       NODE_LTS_NAME: fermium
     tasks: &ref_0
-      - test-latest-server
-      - test-latest-replica_set
-      - test-latest-sharded_cluster
       - test-latest-server-unified
       - test-latest-replica_set-unified
       - test-latest-sharded_cluster-unified
@@ -1693,9 +1657,6 @@ buildvariants:
     expansions:
       NODE_LTS_NAME: fermium
     tasks: &ref_1
-      - test-latest-server
-      - test-latest-replica_set
-      - test-latest-sharded_cluster
       - test-latest-server-unified
       - test-latest-replica_set-unified
       - test-latest-sharded_cluster-unified
@@ -1881,9 +1842,6 @@ buildvariants:
       NODE_LTS_NAME: fermium
       CLIENT_ENCRYPTION: true
     tasks: &ref_3
-      - test-latest-server
-      - test-latest-replica_set
-      - test-latest-sharded_cluster
       - test-latest-server-unified
       - test-latest-replica_set-unified
       - test-latest-sharded_cluster-unified

.evergreen/config.yml.in

@@ -11,7 +11,7 @@ command_type: system
 # Protect ourself against rogue test case, or curl gone wild, that runs forever
 # Good rule of thumb: the averageish length a task takes, times 5
 # That roughly accounts for variable system performance for various buildvariants
-exec_timeout_secs: 1200
+exec_timeout_secs: 1500
 
 # What to do when evergreen hits the timeout (`post:` tasks are run automatically)
 timeout:

.evergreen/generate_evergreen_tasks.js

@@ -5,16 +5,15 @@ const fs = require('fs');
 const yaml = require('js-yaml');
 
 const LATEST_EFFECTIVE_VERSION = '5.0';
-const MONGODB_VERSIONS = ['latest', '4.4', '4.2', '4.0', '3.6', '3.4', '3.2', '3.0', '2.6'];
+const LEGACY_MONGODB_VERSIONS = new Set(['4.4', '4.2', '4.0', '3.6', '3.4', '3.2', '3.0', '2.6']);
+const MONGODB_VERSIONS = ['latest'].concat(Array.from(LEGACY_MONGODB_VERSIONS));
 const AWS_AUTH_VERSIONS = ['latest', '4.4'];
 const OCSP_VERSIONS = ['latest', '4.4'];
 const TLS_VERSIONS = ['latest', '4.2']; // also test on 4.2 because 4.4+ currently skipped on windows
 const NODE_VERSIONS = ['fermium', 'erbium', 'dubnium', 'carbon', 'boron', 'argon'];
-const TOPOLOGIES = ['server', 'replica_set', 'sharded_cluster'].concat([
-  'server-unified',
-  'replica_set-unified',
-  'sharded_cluster-unified'
-]);
+const LEGACY_TOPOLOGIES = new Set(['server', 'replica_set', 'sharded_cluster']);
+const UNIFIED_TOPOLOGIES = Array.from(LEGACY_TOPOLOGIES).map(topology => `${topology}-unified`);
+
 
 const OPERATING_SYSTEMS = [
   {
@@ -110,10 +109,16 @@ function makeTask({ mongoVersion, topology }) {
 }
 
 MONGODB_VERSIONS.forEach(mongoVersion => {
-  TOPOLOGIES.forEach(topology =>
+  Array.from(LEGACY_TOPOLOGIES).concat(UNIFIED_TOPOLOGIES).forEach(topology => {
+    if (LEGACY_TOPOLOGIES.has(topology) && !LEGACY_MONGODB_VERSIONS.has(mongoVersion)) {
+      // MongoDB 5.0+ is only supported by the Unified Topology in driver 3.7+
+      // therefore testing the legacy toplogy can be skipped
+      return;
+    }
     BASE_TASKS.push(makeTask({ mongoVersion, topology }))
-  );
+  });
 });
+
 BASE_TASKS.push({
   name: `test-latest-server-v1-api`,
   tags: ['latest', 'server', 'v1-api'],

test/functional/cursor.test.js

@@ -4119,62 +4119,6 @@ describe('Cursor', function() {
     }
   });
 
-  it('Correctly decorate the collection cursor count command with skip, limit, hint, readConcern', {
-    // Add a tag that our runner can trigger on
-    // in this case we are setting that node needs to be higher than 0.10.X to run
-    metadata: {
-      requires: {
-        topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'],
-        mongodb: '<4.9'
-      }
-    },
-
-    // The actual test we wish to run
-    test: function(done) {
-      var started = [];
-
-      var listener = require('../..').instrument(function(err) {
-        test.equal(null, err);
-      });
-
-      listener.on('started', function(event) {
-        if (event.commandName === 'count') started.push(event);
-      });
-
-      var configuration = this.configuration;
-      var client = configuration.newClient(configuration.writeConcernMax(), { poolSize: 1 });
-      client.connect(function(err, client) {
-        var db = client.db(configuration.db);
-        test.equal(null, err);
-
-        db.collection('cursor_count_test1', { readConcern: { level: 'local' } }).count(
-          {
-            project: '123'
-          },
-          {
-            readConcern: { level: 'local' },
-            limit: 5,
-            skip: 5,
-            hint: { project: 1 }
-          },
-          function(err) {
-            test.equal(null, err);
-            test.equal(1, started.length);
-            if (started[0].command.readConcern)
-              test.deepEqual({ level: 'local' }, started[0].command.readConcern);
-            test.deepEqual({ project: 1 }, started[0].command.hint);
-            test.equal(5, started[0].command.skip);
-            test.equal(5, started[0].command.limit);
-
-            listener.uninstrument();
-
-            client.close(done);
-          }
-        );
-      });
-    }
-  });
-
   it('Should properly kill a cursor', {
     metadata: {
       requires: {

test/functional/unified-spec-runner/entities.ts

@@ -45,14 +45,10 @@ function serverApiConfig() {
 }
 
 function getClient(address) {
-const options: any = { 
+  const options: any = { 
     useUnifiedTopology: Boolean(process.env.MONGODB_UNIFIED_TOPOLOGY), 
     serverApi: serverApiConfig() 
-};
-  const serverApi = serverApiConfig();
-  if (serverApi) {
-    options.serverApi = serverApi;
-  }
+  };
   return new MongoClient(`mongodb://${address}`, options);
 }