All non-lb or TLS tests

Author: baileympearson

test/integration/client-side-encryption/client_side_encryption.spec.test.ts

@@ -10,51 +10,6 @@ import { runUnifiedSuite } from '../../tools/unified-spec-runner/runner';
 
 const isAuthEnabled = process.env.AUTH === 'auth';
 
-// 'TODO: NODE-3891 - fix tests broken when AUTH enabled'
-const skippedAuthTests = [
-  'Insert a document with auto encryption using the AWS provider with temporary credentials',
-  'Insert a document with auto encryption using Azure KMS provider',
-  '$rename works if target value has same encryption options',
-  'Bulk write with encryption',
-  'Insert with bypassAutoEncryption',
-  'Insert with bypassAutoEncryption for local schema',
-  'ping is bypassed',
-  'deleteOne with deterministic encryption',
-  'deleteMany with deterministic encryption',
-  'distinct with deterministic encryption',
-  'Find with deterministic encryption',
-  'Find with $in with deterministic encryption',
-  'findOneAndReplace with deterministic encryption',
-  'findOneAndUpdate with deterministic encryption',
-  'Insert a document with auto encryption using GCP KMS provider',
-  'getMore with encryption',
-  'unset works with an encrypted field',
-  'updateOne with deterministic encryption',
-  'updateMany with deterministic encryption',
-  'replaceOne with encryption',
-  'Insert with encryption on a missing key',
-  'A local schema should override',
-  'Count with deterministic encryption',
-  'Insert a document with auto encryption using local KMS provider',
-  'Insert with encryption using key alt name',
-  'insertMany with encryption',
-  'insertOne with encryption',
-  'findOneAndDelete with deterministic encryption',
-  '$unset works with an encrypted field',
-  'Insert a document with auto encryption using KMIP KMS provider'
-];
-
-// TODO(NODE-6048): Int32 and Long not allowed as batchSize option to cursor.
-const skippedNoAuthTests = ['getMore with encryption'];
-
-const SKIPPED_TESTS = new Set([
-  ...(isAuthEnabled ? skippedAuthTests.concat(skippedNoAuthTests) : skippedNoAuthTests),
-  ...[
-    // the node driver does not have a mapReduce helper
-    'mapReduce deterministic encryption (unsupported)'
-  ]
-]);
-
 describe('Client Side Encryption (Legacy)', function () {
   const testContext = new TestRunnerContext({ requiresCSFLE: true });
   const testSuites = gatherTestSuites(
@@ -70,8 +25,12 @@ describe('Client Side Encryption (Legacy)', function () {
 
   generateTopologyTests(testSuites, testContext, (test, configuration) => {
     const { description } = test;
-    if (SKIPPED_TESTS.has(description)) {
-      return 'Skipped by generic test name skip filter.';
+    if (isAuthEnabled && description === 'getMore with encryption') {
+      // TODO(NODE-6048): Int32 and Long not allowed as batchSize option to cursor.
+      return `TODO(NODE-6048): test requires that auth is disabled.`
+    }
+    if (description === 'mapReduce deterministic encryption (unsupported)') {
+      return `the Node driver does not have a mapReduce helper.`;
     }
     if (
       [

test/integration/connection-monitoring-and-pooling/connection.test.ts

@@ -37,15 +37,6 @@ const commonConnectOptions = {
 };
 
 describe('Connection', function () {
-  beforeEach(
-    skipBrokenAuthTestBeforeEachHook({
-      skippedTests: [
-        'should support calling back multiple times on exhaust commands',
-        'should correctly connect to server using domain socket'
-      ]
-    })
-  );
-
   before(function () {
     return setupDatabase(this.configuration);
   });
@@ -187,7 +178,10 @@ describe('Connection', function () {
         const configuration = this.configuration;
         client = configuration.newClient(
           `mongodb://${encodeURIComponent('/tmp/mongodb-27017.sock')}?w=1`,
-          { maxPoolSize: 1 }
+          {
+            maxPoolSize: 1,
+            auth: { ...this.configuration.options.auth }
+          }
         );
 
         const db = client.db(configuration.db);

test/integration/node-specific/operation_examples.test.ts

@@ -1,5 +1,4 @@
 import { expect } from 'chai';
-import { format as f } from 'util';
 
 import {
   Code,
@@ -8,7 +7,6 @@ import {
   ProfilingLevel,
   ReturnDocument
 } from '../../mongodb';
-import { skipBrokenAuthTestBeforeEachHook } from '../../tools/runner/hooks/configuration';
 import { sleep as delay } from '../../tools/utils';
 import { setupDatabase } from '../shared';
 
@@ -27,16 +25,6 @@ describe('Operations', function () {
     return setupDatabase(this.configuration, ['integration_tests_2', 'hr', 'reporting']);
   });
 
-  beforeEach(
-    skipBrokenAuthTestBeforeEachHook({
-      skippedTests: [
-        'Should correctly connect to a replicaset',
-        'Should connect to mongos proxies using connectiong string With Promises',
-        'Should correctly connect to a replicaset With Promises'
-      ]
-    })
-  );
-
   /**************************************************************************
    *
    * COLLECTION TESTS
@@ -3244,14 +3232,7 @@ describe('Operations', function () {
 
     test: function () {
       const configuration = this.configuration;
-      const url = f(
-        'mongodb://%s,%s/%s?replicaSet=%s&readPreference=%s',
-        f('%s:%s', configuration.host, configuration.port),
-        f('%s:%s', configuration.host, configuration.port + 1),
-        'integration_test_',
-        configuration.replicasetName,
-        'primary'
-      );
+      const url = configuration.url();
 
       const client = configuration.newClient(url);
       return client.connect().then(function (client) {
@@ -3291,13 +3272,7 @@ describe('Operations', function () {
 
     test: function () {
       const configuration = this.configuration;
-      const url = f(
-        'mongodb://%s:%s,%s:%s/sharded_test_db?w=1',
-        configuration.host,
-        configuration.port,
-        configuration.host,
-        configuration.port + 1
-      );
+      const url = configuration.url();
 
       const client = configuration.newClient(url);
       return client.connect().then(function (client) {

test/tools/runner/hooks/configuration.ts

@@ -107,22 +107,6 @@ const testSkipBeforeEachHook = async function () {
   }
 };
 
-/**
- * TODO: NODE-3891 - fix tests that are broken with auth enabled and remove this hook
- * @param skippedTests - define list of tests to skip
- * @returns
- */
-export const skipBrokenAuthTestBeforeEachHook = function (
-  { skippedTests }: { skippedTests: string[] } = { skippedTests: [] }
-) {
-  return function () {
-    if (process.env.AUTH === 'auth' && skippedTests.includes(this.currentTest.title)) {
-      this.currentTest.skipReason = 'TODO: NODE-3891 - fix tests broken when AUTH enabled';
-      this.skip();
-    }
-  };
-};
-
 const testConfigBeforeHook = async function () {
   if (process.env.DRIVERS_ATLAS_TESTING_URI) {
     this.configuration = new AstrolabeTestConfiguration(process.env.DRIVERS_ATLAS_TESTING_URI, {});