cleanup

Author: emadum

lib/core/wireprotocol/query.js

@@ -140,10 +140,8 @@ function prepareFindCommand(server, ns, cmd, cursorState) {
   if (cmd.maxTimeMS) findCmd.maxTimeMS = cmd.maxTimeMS;
   if (cmd.min) findCmd.min = cmd.min;
   if (cmd.max) findCmd.max = cmd.max;
-  // if (maxWireVersion(server) < 13) {
   findCmd.returnKey = cmd.returnKey ? cmd.returnKey : false;
   findCmd.showRecordId = cmd.showDiskLoc ? cmd.showDiskLoc : false;
-  // }
   if (cmd.snapshot) findCmd.snapshot = cmd.snapshot;
   if (cmd.tailable) findCmd.tailable = cmd.tailable;
   if (cmd.oplogReplay) findCmd.oplogReplay = cmd.oplogReplay;

test/functional/apm.test.js

@@ -161,7 +161,7 @@ describe('APM', function() {
     }
   });
 
-  it.skip('should correctly handle cursor.close when no cursor existed', {
+  it('should correctly handle cursor.close when no cursor existed', {
     metadata: { requires: { topology: ['single', 'replicaset'] } },
 
     // The actual test we wish to run

test/functional/change_stream.test.js

@@ -1984,12 +1984,11 @@ describe('Change Streams', function() {
     });
   });
 
-  // FIXME(NODE-3191)
-  describe.skip('resumeToken', function() {
+  describe('resumeToken', function() {
     class MockServerManager {
       constructor(config, commandIterators) {
         this.config = config;
-        this.cmdList = new Set(['ismaster', 'endSessions', 'aggregate', 'getMore']);
+        this.cmdList = new Set(['ismaster', 'hello', 'endSessions', 'aggregate', 'getMore']);
         this.database = 'test_db';
         this.collection = 'test_coll';
         this.ns = `${this.database}.${this.collection}`;
@@ -2087,6 +2086,10 @@ describe('Change Streams', function() {
         });
       }
 
+      hello() {
+        return this.ismaster();
+      }
+
       endSessions() {
         return { ok: 1 };
       }

test/functional/connection.test.js

@@ -222,7 +222,6 @@ describe('Connection', function() {
    */
   function connectionTester(configuration, testName, callback) {
     return function(err, client) {
-      test.ok(client);
       var db = client.db(configuration.db);
       test.equal(err, null);
 

test/functional/versioned-api.test.js

@@ -5,23 +5,14 @@ const loadSpecTests = require('../spec/index').loadSpecTests;
 const runUnifiedTest = require('./unified-spec-runner/runner').runUnifiedTest;
 
 describe('Versioned API', function() {
-  it.skip('should throw an error if serverApi version is provided via the uri with new parser', {
+  it('should throw an error if serverApi version is provided via the uri with new parser', {
     metadata: { topology: 'single' },
-    test: function() {
+    test: function(done) {
       const client = this.configuration.newClient({ serverApi: '1' }, { useNewUrlParser: true });
-      client.connect(err =>
-        expect(err).to.match(/URI cannot contain `serverApi`, it can only be passed to the client/)
-      );
-    }
-  });
-
-  it.skip('should throw an error if serverApi version is provided via the uri with old parser', {
-    metadata: { topology: 'single' },
-    test: function() {
-      const client = this.configuration.newClient({ serverApi: '1' }, { useNewUrlParser: false });
-      client.connect(err =>
-        expect(err).to.match(/URI cannot contain `serverApi`, it can only be passed to the client/)
-      );
+      client.connect(err => {
+        expect(err).to.match(/URI cannot contain `serverApi`, it can only be passed to the client/);
+        client.close(done);
+      });
     }
   });
 

test/unit/core/single/sessions.test.js

@@ -424,8 +424,9 @@ describe('Sessions (Single)', function() {
     }
   });
 
-  it('should use the same session for any killCursor issued by a cursor', {
-    metadata: { requires: { topology: 'single', apiVersion: false } }, // FIXME(NODE-3191)
+  // FIXME(NODE-3191)
+  it.skip('should use the same session for any killCursor issued by a cursor', {
+    metadata: { requires: { topology: 'single' } },
     test: function(_done) {
       const client = new Server(test.server.address());
       const sessionPool = new ServerSessionPool(client);