test(unified-topology): final batch of tests skipped when unified

Author: mbroadst

test/functional/mongo_client_tests.js

@@ -609,6 +609,11 @@ describe('MongoClient', function() {
     // The actual test we wish to run
     test: function(done) {
       var configuration = this.configuration;
+      if (configuration.usingUnifiedTopology()) {
+        // this is no longer relevant with the unified topology
+        return this.skip();
+      }
+
       var url = configuration
         .url()
         .replace('rs_name=rs', '')

test/functional/sharding_connection_tests.js

@@ -17,9 +17,12 @@ describe('Sharding (Connection)', function() {
     // The actual test we wish to run
     test: function(done) {
       const configuration = this.configuration;
+      if (configuration.usingUnifiedTopology()) {
+        // disable for inspection of legacy properties
+        return this.skip();
+      }
 
       const url = `${configuration.url()}?w=1&readPreference=secondaryPreferred&readPreferenceTags=sf%3A1`;
-
       const client = configuration.newClient(url, { haInterval: 500, useNewUrlParser: true });
 
       client.connect(err => {
@@ -81,6 +84,10 @@ describe('Sharding (Connection)', function() {
     // The actual test we wish to run
     test: function(done) {
       const configuration = this.configuration;
+      if (configuration.usingUnifiedTopology()) {
+        // disable for inspection of legacy properties
+        return this.skip();
+      }
 
       const url = `${configuration.url()}?w=1&readPreference=secondaryPreferred&readPreferenceTags=sf%3A1`;
 
@@ -123,6 +130,11 @@ describe('Sharding (Connection)', function() {
     // The actual test we wish to run
     test: function(done) {
       const configuration = this.configuration;
+      if (configuration.usingUnifiedTopology()) {
+        // disable for inspection of legacy properties
+        return this.skip();
+      }
+
       const url = `${configuration.url()}?w=1&readPreference=secondaryPreferred&readPreferenceTags=sf%3A1`;
 
       const client = configuration.newClient(url, { useNewUrlParser: true, reconnectTries: 10 });

test/functional/transactions_tests.js

@@ -96,7 +96,7 @@ class TransactionsTestContext {
   setup(config) {
     this.url = `mongodb://${config.host}:${config.port}/?replicaSet=${config.replicasetName}`;
 
-    this.sharedClient = config.newClient(this.url, { serverSelectionTimeoutMS: 10000 });
+    this.sharedClient = config.newClient(this.url);
     return this.sharedClient.connect();
   }
 
@@ -546,6 +546,7 @@ function testOperation(operation, obj, context, options) {
           const errorLabelsOmit = result.errorLabelsOmit;
 
           if (errorLabelsContain) {
+            expect(err).to.have.property('errorLabels');
             expect(err.errorLabels).to.include.members(errorLabelsContain);
           }