nodejs
diff --git a/‎lib/internal/test_runner/test.js‎
Lines changed: 3 additions & 1 deletion b/‎lib/internal/test_runner/test.js‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎test/parallel/test-runner-aftereach-runtime-skip.js‎
Lines changed: 36 additions & 0 deletions b/‎test/parallel/test-runner-aftereach-runtime-skip.js‎
Lines changed: 36 additions & 0 deletions
@@ -1152,13 +1152,15 @@ class Test extends AsyncResource {
       ctx.plan(this.expectedAssertions);
     }
 
+    const wasSkippedBeforeRun = this.skipped;
+
     const after = async () => {
       if (this.hooks.after.length > 0) {
         await this.runHook('after', hookArgs);
       }
     };
     const afterEach = runOnce(async () => {
-      if (this.parent?.hooks.afterEach.length > 0 && !this.skipped) {
+      if (this.parent?.hooks.afterEach.length > 0 && !wasSkippedBeforeRun) {
         await this.parent.runHook('afterEach', hookArgs);
       }
     }, kRunOnceOptions);
 
@@ -0,0 +1,36 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('node:assert');
+const { beforeEach, afterEach, test } = require('node:test');
+
+let beforeEachTotal = 0;
+let afterEachRuntimeSkip = 0;
+let afterEachTotal = 0;
+
+beforeEach(common.mustCall(() => {
+  beforeEachTotal++;
+}, 2));
+
+afterEach(common.mustCall((t) => {
+  afterEachTotal++;
+  if (t.name === 'runtime skip') {
+    afterEachRuntimeSkip++;
+  }
+}, 2));
+
+test('normal test', (t) => {
+  t.assert.ok(true);
+});
+
+test('runtime skip', (t) => {
+  t.skip('skip after setup');
+});
+
+test('static skip', { skip: true }, common.mustNotCall());
+
+process.on('exit', () => {
+  assert.strictEqual(beforeEachTotal, 2);
+  assert.strictEqual(afterEachRuntimeSkip, 1);
+  assert.strictEqual(afterEachTotal, 2);
+});
Original file line number	Diff line number	Diff line change
@@ -1152,13 +1152,15 @@ class Test extends AsyncResource {
1152	1152	ctx.plan(this.expectedAssertions);
1153	1153	}
1154	1154
	1155	+ const wasSkippedBeforeRun = this.skipped;
	1156	+
1155	1157	const after = async () => {
1156	1158	if (this.hooks.after.length > 0) {
1157	1159	await this.runHook('after', hookArgs);
1158	1160	}
1159	1161	};
1160	1162	const afterEach = runOnce(async () => {
1161		- if (this.parent?.hooks.afterEach.length > 0 && !this.skipped) {
	1163	+ if (this.parent?.hooks.afterEach.length > 0 && !wasSkippedBeforeRun) {
1162	1164	await this.parent.runHook('afterEach', hookArgs);
1163	1165	}
1164	1166	}, kRunOnceOptions);