test: do not assume cwd in snapshot tests

aduh95 · marco-ippolito · commit 662bf524e1ee · 2024-08-19T10:32:27.000+02:00
PR-URL: #53146 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: Moshe Atlow <moshe@atlow.co.il> Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/test/common/assertSnapshot.js b/test/common/assertSnapshot.js
@@ -25,7 +25,7 @@ function replaceWindowsPaths(str) {
 }
 
 function replaceFullPaths(str) {
- return str.replaceAll(process.cwd(), '');
+ return str.replaceAll(path.resolve(__dirname, '../..'), '');
 }
 
 function transform(...args) {
@@ -78,7 +78,7 @@ async function spawnAndAssert(filename, transform = (x) => x, { tty = false, ...
 return;
 }
 const flags = common.parseTestFlags(filename);
- const executable = tty ? 'tools/pseudo-tty.py' : process.execPath;
+ const executable = tty ? path.join(__dirname, '../..', 'tools/pseudo-tty.py') : process.execPath;
 const args = tty ? [process.execPath, ...flags, filename] : [...flags, filename];
 const { stdout, stderr } = await common.spawnPromisified(executable, args, options);
 await assertSnapshot(transform(`${stdout}${stderr}`), filename);
diff --git a/test/parallel/test-runner-output.mjs b/test/parallel/test-runner-output.mjs
@@ -3,6 +3,8 @@ import * as fixtures from '../common/fixtures.mjs';
 import * as snapshot from '../common/assertSnapshot.js';
 import { describe, it } from 'node:test';
 import { hostname } from 'node:os';
+import { chdir, cwd } from 'node:process';
+import { fileURLToPath } from 'node:url';
 
 const skipForceColors =
 process.config.variables.icu_gyp_path !== 'tools/icu/icu-generic.gyp' ||
@@ -14,8 +16,10 @@ function replaceTestDuration(str) {
 .replaceAll(/duration_ms [0-9.]+/g, 'duration_ms *');
 }
 
+const root = fileURLToPath(new URL('../..', import.meta.url)).slice(0, -1);
+
 const color = '(\\[\\d+m)';
-const stackTraceBasePath = new RegExp(`${color}\\(${process.cwd().replaceAll(/[\\^$*+?.()|[\]{}]/g, '\\$&')}/?${color}(.*)${color}\\)`, 'g');
+const stackTraceBasePath = new RegExp(`${color}\\(${root.replaceAll(/[\\^$*+?.()|[\]{}]/g, '\\$&')}/?${color}(.*)${color}\\)`, 'g');
 
 function replaceSpecDuration(str) {
 return str
@@ -149,6 +153,9 @@ const tests = [
 }),
 }));
 
+if (cwd() !== root) {
+ chdir(root);
+}
 describe('test runner output', { concurrency: true }, () => {
 for (const { name, fn } of tests) {
 it(name, fn);

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ function replaceWindowsPaths(str) {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`functionreplaceFullPaths(str){`
`28`		`-returnstr.replaceAll(process.cwd(),'');`
	`28`	`+returnstr.replaceAll(path.resolve(__dirname,'../..'),'');`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`functiontransform(...args){`
`@@ -78,7 +78,7 @@ async function spawnAndAssert(filename, transform = (x) => x, { tty = false, ...`
`78`	`78`	`return;`
`79`	`79`	`}`
`80`	`80`	`constflags=common.parseTestFlags(filename);`
`81`		`-constexecutable=tty ? 'tools/pseudo-tty.py' : process.execPath;`
	`81`	`+constexecutable=tty ? path.join(__dirname,'../..','tools/pseudo-tty.py') : process.execPath;`
`82`	`82`	`constargs=tty ? [process.execPath, ...flags,filename] : [...flags,filename];`
`83`	`83`	`const{ stdout, stderr }=awaitcommon.spawnPromisified(executable,args,options);`
`84`	`84`	awaitassertSnapshot(transform(`${stdout}${stderr}`),filename);
-Original file line number
+Diff line change
 import*assnapshotfrom'../common/assertSnapshot.js';
 import{describe,it}from'node:test';
 import{hostname}from'node:os';
 +import{chdir,cwd}from'node:process';
 +import{fileURLToPath}from'node:url';
 constskipForceColors=
 process.config.variables.icu_gyp_path!=='tools/icu/icu-generic.gyp'||
 .replaceAll(/duration_ms[0-9.]+/g,'duration_ms *');
+}
 +constroot=fileURLToPath(newURL('../..',import.meta.url)).slice(0,-1);
++
 constcolor='(\\[\\d+m)';
 -conststackTraceBasePath=newRegExp(`${color}\\(${process.cwd().replaceAll(/[\\^$*+?.()|[\]{}]/g,'\\$&')}/?${color}(.*)${color}\\)`,'g');
 +conststackTraceBasePath=newRegExp(`${color}\\(${root.replaceAll(/[\\^$*+?.()|[\]{}]/g,'\\$&')}/?${color}(.*)${color}\\)`,'g');
 functionreplaceSpecDuration(str){
 returnstr
 }),
 }));
 +if(cwd()!==root){
 +chdir(root);
 +}
 describe('test runner output',{concurrency: true},()=>{
 for(const{ name, fn }oftests){
 it(name,fn);