fixup! address more comments

Author: jakecastelli

lib/internal/test_runner/test.js

@@ -605,17 +605,15 @@ class Test extends AsyncResource {
           throw new ERR_INVALID_ARG_TYPE('options.concurrency', ['boolean', 'number'], concurrency);
     }
 
-    // Take timeout from cli
-    const cliTimeout = this.config.timeout;
-    if (cliTimeout != null && cliTimeout !== Infinity) {
-      validateNumber(cliTimeout, 'options.timeout', 0, TIMEOUT_MAX);
-      this.timeout = cliTimeout;
-    }
-
-    // Take timeout from options
     if (timeout != null && timeout !== Infinity) {
       validateNumber(timeout, 'options.timeout', 0, TIMEOUT_MAX);
       this.timeout = timeout;
+    } else {
+      const cliTimeout = this.config.timeout;
+      if (cliTimeout != null && cliTimeout !== Infinity) {
+        validateNumber(cliTimeout, 'options.timeout', 0, TIMEOUT_MAX);
+        this.timeout = cliTimeout;
+      }
     }
 
     if (skip) {

test/fixtures/test-runner/output/test-timeout-flag.js

@@ -1,25 +1,25 @@
 // Flags: --test-timeout=20
 'use strict';
-const { describe, test, afterEach } = require('node:test');
-const { setTimeout } = require('node:timers/promises');
-
-let timeout;
+const { describe, test } = require('node:test');
 
 describe('--test-timeout is set to 20ms', () => {
   test('should timeout after 20ms', async () => {
-    timeout = await setTimeout(2000);
+    await new Promise(resolve => {
+      const timeout = setTimeout(resolve, 200000);
+      timeout.unref();
+    });
   });
   test('should timeout after 5ms', { timeout: 5 }, async () => {
-    timeout = await setTimeout(2000);
-  });
-  test('should not timeout', { timeout: 5000 }, async () => {
-    await setTimeout(200);
+    await new Promise(resolve => {
+      const timeout = setTimeout(resolve, 200000);
+      timeout.unref();
+    });
   });
-  test('should pass', async () => {});
-
-  afterEach(() => {
-    if (timeout) {
+  test('should not timeout', { timeout: 50000 }, async () => {
+    await new Promise(resolve => {
+      const timeout = setTimeout(resolve, 200);
       timeout.unref();
-    }
+    });
   });
+  test('should pass', async () => {});
 });