test: better skipping in legacy spec runner

Author: emadum

test/functional/spec-runner/index.js

@@ -135,29 +135,8 @@ function generateTopologyTests(testSuites, testContext, filter) {
           beforeEach(() => prepareDatabaseForSuite(testSuite, testContext));
           afterEach(() => testContext.cleanupAfterSuite());
           testSuite.tests.forEach(spec => {
-            it(spec.description, function () {
-              if (requires.authEnabled && process.env.AUTH !== 'auth') {
-                // TODO: We do not have a way to determine if auth is enabled in our mocha metadata
-                // We need to do a admin.command({getCmdLineOpts: 1}) if it errors (code=13) auth is on
-                this.skip();
-              }
-
-              if (
-                spec.operations.some(
-                  op => op.name === 'waitForEvent' && op.arguments.event === 'PoolReadyEvent'
-                )
-              ) {
-                // TODO(NODE-2994): Connection storms work will add new events to connection pool
-                this.skip();
-              }
-
-              if (
-                spec.skipReason ||
-                (filter && typeof filter === 'function' && !filter(spec, this.configuration))
-              ) {
-                return this.skip();
-              }
-
+            const maybeIt = shouldRunSpecTest.call(this, requires, spec, filter) ? it : it.skip;
+            maybeIt(spec.description, function () {
               let testPromise = Promise.resolve();
               if (spec.failPoint) {
                 testPromise = testPromise.then(() => testContext.enableFailPoint(spec.failPoint));
@@ -180,6 +159,31 @@ function generateTopologyTests(testSuites, testContext, filter) {
   });
 }
 
+function shouldRunSpecTest(requires, spec, filter) {
+  if (requires.authEnabled && process.env.AUTH !== 'auth') {
+    // TODO: We do not have a way to determine if auth is enabled in our mocha metadata
+    // We need to do a admin.command({getCmdLineOpts: 1}) if it errors (code=13) auth is on
+    return false;
+  }
+
+  if (
+    spec.operations.some(
+      op => op.name === 'waitForEvent' && op.arguments.event === 'PoolReadyEvent'
+    )
+  ) {
+    // TODO(NODE-2994): Connection storms work will add new events to connection pool
+    return false;
+  }
+
+  if (
+    spec.skipReason ||
+    (filter && typeof filter === 'function' && !filter(spec, this.configuration))
+  ) {
+    return false;
+  }
+  return true;
+}
+
 // Test runner helpers
 function prepareDatabaseForSuite(suite, context) {
   context.dbName = suite.database_name || 'spec_db';