From 13a27c22582b81a8cef5bee4b1624b757918e027 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Fri, 19 Jul 2024 12:07:07 +0200 Subject: [PATCH 1/2] test: use `PYTHON` executable from env in `assertSnapshot` --- test/common/assertSnapshot.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/common/assertSnapshot.js b/test/common/assertSnapshot.js index c4a30a5bae5db7..f3a3f17e5a53f5 100644 --- a/test/common/assertSnapshot.js +++ b/test/common/assertSnapshot.js @@ -78,8 +78,8 @@ async function spawnAndAssert(filename, transform = (x) => x, { tty = false, ... return; } const flags = common.parseTestFlags(filename); - const executable = tty ? path.join(__dirname, '../..', 'tools/pseudo-tty.py') : process.execPath; - const args = tty ? [process.execPath, ...flags, filename] : [...flags, filename]; + const executable = tty ? (process.env.PYTHON || 'python3') : process.execPath; + const args = tty ? [path.join(__dirname, '../..', 'tools/pseudo-tty.py'), process.execPath, ...flags, filename] : [...flags, filename]; const { stdout, stderr } = await common.spawnPromisified(executable, args, options); await assertSnapshot(transform(`${stdout}${stderr}`), filename); } From 7611092f899ef017582a5f9509333c01e3c7352a Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Fri, 19 Jul 2024 14:45:16 +0200 Subject: [PATCH 2/2] fixup! --- test/common/assertSnapshot.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/common/assertSnapshot.js b/test/common/assertSnapshot.js index f3a3f17e5a53f5..a22455160bd9f7 100644 --- a/test/common/assertSnapshot.js +++ b/test/common/assertSnapshot.js @@ -79,7 +79,10 @@ async function spawnAndAssert(filename, transform = (x) => x, { tty = false, ... } const flags = common.parseTestFlags(filename); const executable = tty ? (process.env.PYTHON || 'python3') : process.execPath; - const args = tty ? [path.join(__dirname, '../..', 'tools/pseudo-tty.py'), process.execPath, ...flags, filename] : [...flags, filename]; + const args = + tty ? + [path.join(__dirname, '../..', 'tools/pseudo-tty.py'), process.execPath, ...flags, filename] : + [...flags, filename]; const { stdout, stderr } = await common.spawnPromisified(executable, args, options); await assertSnapshot(transform(`${stdout}${stderr}`), filename); }