fix: run on requirement check

Author: nbbeeken

test/functional/unified-spec-runner/unified-utils.ts

@@ -10,7 +10,7 @@ export function log(message: unknown, ...optionalParameters: unknown[]): void {
   if (ENABLE_UNIFIED_TEST_LOGGING) console.warn(message, ...optionalParameters);
 }
 
-export function getUnmetRequirements(config: TestConfiguration, r: RunOnRequirement): boolean {
+export function topologySatisfies(config: TestConfiguration, r: RunOnRequirement): boolean {
   let ok = true;
   if (r.minServerVersion) {
     const minVersion = patchVersion(r.minServerVersion);

test/functional/unified-spec-runner/unified.test.ts

@@ -2,7 +2,7 @@ import { expect } from 'chai';
 import { ReadPreference } from '../../../src/read_preference';
 import { loadSpecTests } from '../../spec/index';
 import * as uni from './schema';
-import { getUnmetRequirements, patchVersion, zip, log } from './unified-utils';
+import { patchVersion, zip, log, topologySatisfies } from './unified-utils';
 import { CommandEvent, EntitiesMap } from './entities';
 import { ns } from '../../../src/utils';
 import { executeOperationAndCheck } from './operations';
@@ -43,8 +43,12 @@ async function runOne(
 
   // If test.runOnRequirements is specified, the test runner MUST skip the test unless one or more
   // runOnRequirement objects are satisfied.
-  if (test.runOnRequirements) {
-    if (!test.runOnRequirements.some(r => getUnmetRequirements(ctx.configuration, r))) {
+  const allRequirements = [
+    ...(unifiedSuite.runOnRequirements ?? []),
+    ...(test.runOnRequirements ?? [])
+  ];
+  for (const requirement of allRequirements) {
+    if (!topologySatisfies(ctx.configuration, requirement)) {
       ctx.skip();
     }
   }

test/tools/runner/config.js

@@ -186,7 +186,7 @@ class TestConfiguration {
       } else {
         multipleHosts = this.options.hostAddresses
           .reduce((built, host) => {
-            built.push(host.type === 'tcp' ? `${host.host}:${host.port}` : host.host);
+            built.push(typeof host.port === 'number' ? `${host.host}:${host.port}` : host.host);
             return built;
           }, [])
           .join(',');