test w/ fix before cleanup

Author: baileympearson

test/integration/client-side-encryption/client_side_encryption.prose.corpus.test.js

@@ -148,7 +148,7 @@ describe('Client Side Encryption Prose Corpus Test', function () {
     }
   }
 
-  installNodeDNSWorkaroundHooks('beforeEach');
+  installNodeDNSWorkaroundHooks();
 
   before(function () {
     // 1. Create a MongoClient without encryption enabled (referred to as ``client``).

test/integration/client-side-encryption/client_side_encryption.prose.deadlock.js

@@ -94,7 +94,6 @@ function deadlockTests(_metadata) {
   metadata.skipReason = 'TODO: NODE-3891 - fix tests broken when AUTH enabled';
   describe('Connection Pool Deadlock Prevention', function () {
     installNodeDNSWorkaroundHooks('beforeEach');
-
     beforeEach(function () {
       try {
         const mongodbClientEncryption = this.configuration.mongodbClientEncryption;

test/integration/client-side-encryption/client_side_encryption.prose.test.js

@@ -70,7 +70,7 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
     'base64'
   );
 
-  installNodeDNSWorkaroundHooks('beforeEach');
+  installNodeDNSWorkaroundHooks('before');
 
   describe('Data key and double encryption', function () {
     // Data key and double encryption

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

@@ -73,8 +73,7 @@ describe('Client Side Encryption (Legacy)', function () {
     testContext
   );
 
-  installNodeDNSWorkaroundHooks('beforeEach');
-
+  installNodeDNSWorkaroundHooks('before');
   after(() => testContext.teardown());
   before(function () {
     return testContext.setup(this.configuration);
@@ -98,7 +97,7 @@ describe('Client Side Encryption (Legacy)', function () {
 });
 
 describe('Client Side Encryption (Unified)', function () {
-  installNodeDNSWorkaroundHooks('beforeEach');
+  installNodeDNSWorkaroundHooks('before');
   runUnifiedSuite(loadSpecTests(path.join('client-side-encryption', 'tests', 'unified')), () =>
     isServerless ? 'Unified CSFLE tests to not run on serverless' : false
   );

test/integration/client-side-encryption/driver.test.ts

@@ -22,7 +22,7 @@ describe('Client Side Encryption Functional', function () {
   const keyVaultCollName = 'datakeys';
   const keyVaultNamespace = `${keyVaultDbName}.${keyVaultCollName}`;
 
-  installNodeDNSWorkaroundHooks('beforeEach');
+  installNodeDNSWorkaroundHooks('before');
 
   it('CSFLE_KMS_PROVIDERS should be valid EJSON', function () {
     const CSFLE_KMS_PROVIDERS = process.env.CSFLE_KMS_PROVIDERS;

test/manual/socks5.test.ts

@@ -305,9 +305,12 @@ async function testConnection(connectionString, clientOptions) {
   let topologyType;
   client.on('topologyDescriptionChanged', ev => (topologyType = ev.newDescription.type));
 
-  await client.connect();
-  await client.db('admin').command({ hello: 1 });
-  await client.db('test').collection('test').findOne({});
-  await client.close();
+  try {
+    await client.connect();
+    await client.db('admin').command({ hello: 1 });
+    await client.db('test').collection('test').findOne({});
+  } finally {
+    await client.close();
+  }
   return topologyType;
 }

test/tools/runner/hooks/configuration.js

@@ -182,29 +182,27 @@ function installNodeDNSWorkaroundHooks(type) {
     process.version.startsWith('v19') ||
     process.version.startsWith('v20');
 
-  console.error('configuring hooks');
-
   if (!isAffectedNodeVersion || !['before', 'beforeEach'].includes(type)) {
     return;
   }
 
-  if (type === 'beforeEach') {
-    beforeEach(() => {
-      setDefaultResultOrder('ipv4first');
-    });
-    afterEach(() => {
-      setDefaultResultOrder('verbatim');
-    });
-  } else if (type === 'before') {
-    console.error('hooks set');
-    before(() => {
-      console.error('setting dns resolution ordering');
-      setDefaultResultOrder('ipv4first');
-    });
-    after(() => {
-      setDefaultResultOrder('verbatim');
-    });
-  }
+  // if (type === 'beforeEach') {
+  beforeEach(() => {
+    setDefaultResultOrder('ipv4first');
+  });
+  afterEach(() => {
+    setDefaultResultOrder('verbatim');
+  });
+  // } else if (type === 'before') {
+  //   before(() => {
+  //     console.error(source, 'setting dns resolution ordering');
+  //     setDefaultResultOrder('ipv4first');
+  //   });
+  //   after(() => {
+  //     console.error(source, 'set back to verbatim');
+  //     setDefaultResultOrder('verbatim');
+  //   });
+  // }
 }
 
 module.exports = {