test_runner: fix global after hook

PR-URL: #48231Fixes: #48230 Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>

Author: MoLow

lib/internal/test_runner/harness.js

@@ -140,8 +140,8 @@ function setup(root){
 constrejectionHandler=
 createProcessEventHandler('unhandledRejection',root);
 constcoverage=configureCoverage(root,globalOptions);
-constexitHandler=()=>{
-root.postRun(newERR_TEST_FAILURE(
+constexitHandler=async()=>{
+awaitroot.run(newERR_TEST_FAILURE(
 'Promise resolution is still pending but the event loop has already resolved',
 kCancelledByParent));
 
@@ -150,8 +150,8 @@ function setup(root){
 process.removeListener('uncaughtException',exceptionHandler);
 };
 
-constterminationHandler=()=>{
-exitHandler();
+constterminationHandler=async()=>{
+awaitexitHandler();
 process.exit();
 };
 

lib/internal/test_runner/test.js

@@ -427,7 +427,7 @@ class Test extends AsyncResource{
 validateOneOf(name,'hook name',kHookNames);
 // eslint-disable-next-line no-use-before-define
 consthook=newTestHook(fn,options);
-if(name==='before'){
+if(name==='before'||name==='after'){
 hook.run=runOnce(hook.run);
 }
 ArrayPrototypePush(this.hooks[name],hook);
@@ -514,7 +514,7 @@ class Test extends AsyncResource{
 }
 }
 
-asyncrun(){
+asyncrun(pendingSubtestsError){
 if(this.parent!==null){
 this.parent.activeSubtests++;
 }
@@ -526,11 +526,11 @@ class Test extends AsyncResource{
 }
 
 const{ args, ctx }=this.getRunArgs();
-constafter=runOnce(async()=>{
+constafter=async()=>{
 if(this.hooks.after.length>0){
 awaitthis.runHook('after',{ args, ctx });
 }
-});
+};
 constafterEach=runOnce(async()=>{
 if(this.parent?.hooks.afterEach.length>0){
 awaitthis.parent.runHook('afterEach',{ args, ctx });
@@ -579,8 +579,8 @@ class Test extends AsyncResource{
 awaitafter();
 this.pass();
 }catch(err){
-try{awaitafter();}catch{/* Ignore error. */}
 try{awaitafterEach();}catch{/* test is already failing, let's ignore the error */}
+try{awaitafter();}catch{/* Ignore error. */}
 if(isTestFailureError(err)){
 if(err.failureType===kTestTimeoutFailure){
 this.#cancel(err);
@@ -594,7 +594,7 @@ class Test extends AsyncResource{
 
 // Clean up the test. Then, try to report the results and execute any
 // tests that were pending due to available concurrency.
-this.postRun();
+this.postRun(pendingSubtestsError);
 }
 
 postRun(pendingSubtestsError){

test/fixtures/test-runner/output/hooks.js

@@ -5,6 +5,7 @@ const assert = require('assert');
 const{ test, describe, it, before, after, beforeEach, afterEach }=require('node:test');
 
 before((t)=>t.diagnostic('before 1 called'));
+after((t)=>t.diagnostic('after 1 called'));
 
 describe('describe hooks',()=>{
 consttestArr=[];
@@ -107,17 +108,20 @@ test('test hooks', async (t) =>{
 awaitt.test('nested 2',()=>testArr.push('nested 2'));
 });
 
-assert.deepStrictEqual(testArr,[
-'before test hooks',
-'beforeEach 1','1','afterEach 1',
-'beforeEach 2','2','afterEach 2',
-'beforeEach nested',
-'nested before nested',
-'beforeEach nested 1','nested beforeEach nested 1','nested1','afterEach nested 1','nested afterEach nested 1',
-'beforeEach nested 2','nested beforeEach nested 2','nested 2','afterEach nested 2','nested afterEach nested 2',
-'afterEach nested',
-'nested after nested',
-]);
+t.after(common.mustCall(()=>{
+assert.deepStrictEqual(testArr,[
+'before test hooks',
+'beforeEach 1','1','afterEach 1',
+'beforeEach 2','2','afterEach 2',
+'beforeEach nested',
+'nested before nested',
+'beforeEach nested 1','nested beforeEach nested 1','nested1','afterEach nested 1','nested afterEach nested 1',
+'beforeEach nested 2','nested beforeEach nested 2','nested 2','afterEach nested 2','nested afterEach nested 2',
+'afterEach nested',
+'nested after nested',
+'after test hooks',
+]);
+}));
 });
 
 test('t.before throws',async(t)=>{
@@ -164,3 +168,4 @@ test('t.after() is called if test body throws', (t) =>{
 });
 
 before((t)=>t.diagnostic('before 2 called'));
+after((t)=>t.diagnostic('after 2 called'));

test/fixtures/test-runner/output/hooks.snapshot

@@ -97,6 +97,7 @@ not ok 3 - after throws
  *
  *
  *
+ *
  ...
 # Subtest: beforeEach throws
  # Subtest: 1
@@ -544,6 +545,8 @@ not ok 14 - t.after() is called if test body throws
 1..14
 # before 1 called
 # before 2 called
+# after 1 called
+# after 2 called
 # tests 38
 # suites 8
 # pass 14