diff --git a/src/cmds/test.js b/src/cmds/test.js index 7dbf96930..355667c1c 100644 --- a/src/cmds/test.js +++ b/src/cmds/test.js @@ -1,3 +1,4 @@ +import os from 'os' import kleur from 'kleur' import { loadUserConfig } from '../config/user.js' import testCmd from '../test/index.js' @@ -112,9 +113,10 @@ export default { * @param {any} argv */ async handler (argv) { - // temporarily disable code coverage on node 18 - if (argv.cov && process.version.startsWith('v18.')) { + // temporarily disable code coverage on Windows + if (argv.cov && os.platform() === 'win32') { console.warn(kleur.red('!!! Temporarily disabling code coverage\n')) // eslint-disable-line no-console + console.warn(kleur.red('!!! See https://github.com/ipfs/aegir/issues/1206 for more information')) // eslint-disable-line no-console delete argv.cov } diff --git a/src/test/node.js b/src/test/node.js index d20306eb2..ece316a81 100644 --- a/src/test/node.js +++ b/src/test/node.js @@ -1,4 +1,3 @@ -import os from 'os' import path from 'path' import { fileURLToPath } from 'url' import { execa } from 'execa' @@ -117,17 +116,9 @@ export default async function testNode (argv, execaOptions) { console.warn(kleur.red('!!! See https://github.com/ipfs/aegir/issues/1206 for more information')) // eslint-disable-line no-console killedWhileCollectingCoverage = true - if (os.platform() === 'win32') { - // SIGTERM/SIGKILL doesn't work reliably on windows - execa('taskkill', ['/F', '/pid', `${proc.pid}`]) - .catch(err => { - console.error('Could not kill process with PID', proc.pid, err) // eslint-disable-line no-console - }) - } else { - proc.kill('SIGTERM', { - forceKillAfterTimeout: 1000 - }) - } + proc.kill('SIGTERM', { + forceKillAfterTimeout: 1000 + }) }, argv.covTimeout).unref() } })