clean up additional files generated due to foreground-child watchdog (#1

)

bin/nyc.js

@@ -6,6 +6,8 @@ const { cliWrapper, suppressEPIPE } = require('../lib/commands/helpers')
 const { foregroundChild } = require('foreground-child')
 const resolveFrom = require('resolve-from')
 const NYC = require('../index.js')
+const path = require('path')
+const fs = require('fs')
 
 // parse configuration and command-line arguments;
 // we keep these values in a few different forms,
@@ -86,10 +88,22 @@ async function main () {
   // set process.exitCode. Keep track so that both children are run, but
   // a non-zero exit codes in either one leads to an overall non-zero exit code.
   process.exitCode = 0
-  foregroundChild(childArgs, async (code) => {
+  foregroundChild(childArgs, async (code, signal, processInfo) => {
     let exitCode = process.exitCode || code
 
     try {
+      // clean up foreground-child watchdog process info
+      const parentDir = path.resolve(nyc.tempDirectory())
+      const dir = path.resolve(nyc.tempDirectory(), 'processinfo')
+      const files = await nyc.coverageFiles(dir)
+      for (let i = 0; i < files.length; i++) {
+        const data = await nyc.coverageFileLoad(files[i], dir)
+        if (data.pid === processInfo.watchdogPid) {
+          fs.unlinkSync(path.resolve(parentDir, files[i]))
+          fs.unlinkSync(path.resolve(dir, files[i]))
+        }
+      }
+
       await nyc.writeProcessIndex()
 
       nyc.maybePurgeSourceMapCache()

package.json

@@ -64,7 +64,7 @@
     "decamelize": "^1.2.0",
     "find-cache-dir": "^3.2.0",
     "find-up": "^4.1.0",
-    "foreground-child": "^3.0.0",
+    "foreground-child": "^3.3.0",
     "get-package-type": "^0.1.0",
     "glob": "^7.1.6",
     "istanbul-lib-coverage": "^3.0.0",

test/nyc-integration.js

@@ -193,9 +193,7 @@ t.test('interprets first args after -- as Node.js execArgv', t => testSuccess(t,
   args: ['--', '--expose-gc', path.resolve(fixturesCLI, 'gc.js')]
 }))
 
-// TODO; get this test to pass with `foreground-child@^3.0.0` or delete.
-// See https://github.com/istanbuljs/nyc/pull/1546
-t.skip('--show-process-tree displays a tree of spawned processes', t => testSuccess(t, {
+t.test('--show-process-tree displays a tree of spawned processes', t => testSuccess(t, {
   args: ['--show-process-tree', process.execPath, 'selfspawn-fibonacci.js', '5']
 }))
 

test/processinfo.js

@@ -16,12 +16,7 @@ const resolvedJS = resolve(fixturesCLI, 'selfspawn-fibonacci.js')
 rimraf.sync(resolve(fixturesCLI, tmp))
 t.teardown(() => rimraf(resolve(fixturesCLI, tmp)))
 
-// TODO; get this test to pass with `foreground-child@^3.0.0` or delete.
-// See https://github.com/istanbuljs/nyc/pull/1546
-//
-// The subprocess is failing with the following error:
-// " External ID blorp used by multiple processes"
-t.skip('build some processinfo', t => {
+t.test('build some processinfo', t => {
   var args = [
     bin, '-t', tmp,
     node, 'selfspawn-fibonacci.js', '5'
@@ -43,8 +38,7 @@ t.skip('build some processinfo', t => {
   })
 })
 
-// This test is skipped because it relies on the above "build some processinfo" test.
-t.skip('validate the created processinfo data', async t => {
+t.test('validate the created processinfo data', async t => {
   const covs = (await fs.readdir(resolve(fixturesCLI, tmp)))
     .filter(f => f !== 'processinfo')
 
@@ -73,8 +67,7 @@ t.skip('validate the created processinfo data', async t => {
   }))
 })
 
-// This test is skipped because it relies on the above "build some processinfo" test.
-t.skip('check out the index', async t => {
+t.test('check out the index', async t => {
   const indexFile = resolve(fixturesCLI, tmp, 'processinfo', 'index.json')
   const indexJson = await fs.readFile(indexFile, 'utf-8')
   const index = JSON.parse(indexJson)

test/temp-dir.js

@@ -33,7 +33,7 @@ t.test('creates the default \'tempDir\' when none is specified', async t => {
   t.equal(cliFiles.includes('.temp_directory'), false)
 
   const tempFiles = await fs.readdir(path.resolve(fixturesCLI, '.nyc_output'))
-  t.equal(tempFiles.length, 3) // two coverage files, and processinfo
+  t.equal(tempFiles.length, 2) // a coverage file, and processinfo
 })
 
 t.test('prefers \'tempDirectory\' to \'tempDir\'', async t => {
@@ -56,7 +56,7 @@ t.test('prefers \'tempDirectory\' to \'tempDir\'', async t => {
   t.equal(cliFiles.includes('.temp_directory'), true)
 
   const tempFiles = await fs.readdir(path.resolve(fixturesCLI, '.temp_directory'))
-  t.equal(tempFiles.length, 3)
+  t.equal(tempFiles.length, 2)
 })
 
 t.test('uses the \'tempDir\' option if \'tempDirectory\' is not set', async t => {
@@ -77,5 +77,5 @@ t.test('uses the \'tempDir\' option if \'tempDirectory\' is not set', async t =>
   t.equal(cliFiles.includes('.temp_directory'), false)
 
   const tempFiles = await fs.readdir(path.resolve(fixturesCLI, '.temp_dir'))
-  t.equal(tempFiles.length, 3)
+  t.equal(tempFiles.length, 2)
 })