refactor hooks - final test hopefully

Author: baileympearson

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

@@ -93,7 +93,7 @@ function deadlockTests(_metadata) {
   const metadata = { ..._metadata, requires: { ..._metadata.requires, auth: 'disabled' } };
   metadata.skipReason = 'TODO: NODE-3891 - fix tests broken when AUTH enabled';
   describe('Connection Pool Deadlock Prevention', function () {
-    installNodeDNSWorkaroundHooks('beforeEach');
+    installNodeDNSWorkaroundHooks();
     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('before');
+  installNodeDNSWorkaroundHooks();
 
   describe('Data key and double encryption', function () {
     // Data key and double encryption

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

@@ -73,7 +73,7 @@ describe('Client Side Encryption (Legacy)', function () {
     testContext
   );
 
-  installNodeDNSWorkaroundHooks('before');
+  installNodeDNSWorkaroundHooks();
   after(() => testContext.teardown());
   before(function () {
     return testContext.setup(this.configuration);
@@ -97,7 +97,7 @@ describe('Client Side Encryption (Legacy)', function () {
 });
 
 describe('Client Side Encryption (Unified)', function () {
-  installNodeDNSWorkaroundHooks('before');
+  installNodeDNSWorkaroundHooks();
   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('before');
+  installNodeDNSWorkaroundHooks();
 
   it('CSFLE_KMS_PROVIDERS should be valid EJSON', function () {
     const CSFLE_KMS_PROVIDERS = process.env.CSFLE_KMS_PROVIDERS;

test/manual/atlas-data-lake-testing/atlas_data_lake_testing.spec.js

@@ -23,7 +23,7 @@ describe('Atlas Data Lake - spec', function () {
   // These tests timeout connecting to on localhost mongohoused in CI on Node18+.
   // Manually setting the ip address resolution is safe for testing purposes
   // because in production, mongohoused will never be running on localhost.
-  installNodeDNSWorkaroundHooks('before');
+  installNodeDNSWorkaroundHooks();
 
   before(function () {
     return testContext.setup(this.configuration);

test/manual/socks5.test.ts

@@ -35,7 +35,7 @@ describe('Socks5 Connectivity', function () {
   rsConnectionString.searchParams.set('serverSelectionTimeoutMS', '2000');
   singleConnectionString.searchParams.set('serverSelectionTimeoutMS', '2000');
 
-  installNodeDNSWorkaroundHooks('before');
+  installNodeDNSWorkaroundHooks();
 
   context((proxyUsername ? 'with' : 'without') + ' Socks5 auth required', function () {
     context('with missing required Socks5 auth configuration', function () {

test/tools/runner/hooks/configuration.js

@@ -171,38 +171,29 @@ const beforeAllPluginImports = () => {
 };
 
 /**
- * @param {'beforeEach' | 'before'} type
- *
  * @remarks TODO(NODE-4884): once happy eyeballs support is added, we no longer need to set
  * the default dns resolution order for CI
  */
-function installNodeDNSWorkaroundHooks(type) {
-  const isAffectedNodeVersion =
+function installNodeDNSWorkaroundHooks() {
+  if (
     process.version.startsWith('v18') ||
     process.version.startsWith('v19') ||
-    process.version.startsWith('v20');
-
-  if (!isAffectedNodeVersion || !['before', 'beforeEach'].includes(type)) {
-    return;
+    process.version.startsWith('v20')
+  ) {
+    // We set before hooks because some tests connect in before hooks
+    before(() => {
+      setDefaultResultOrder('ipv4first');
+    });
+
+    // We set beforeEach hooks to make this resilient to test ordering and
+    // ensure each affected test has the correct ip address resolution setting
+    beforeEach(() => {
+      setDefaultResultOrder('ipv4first');
+    });
+    afterEach(() => {
+      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 = {