Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: always build the processinfo temp dir #1061

Merged
merged 1 commit into from Apr 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions bin/nyc.js
Expand Up @@ -65,9 +65,7 @@ if ([
), function (done) {
var mainChildExitCode = process.exitCode

if (argv.showProcessTree || argv.buildProcessTree) {
nyc.writeProcessIndex()
}
nyc.writeProcessIndex()

if (argv.checkCoverage) {
nyc.checkCoverage({
Expand Down
9 changes: 1 addition & 8 deletions index.js
Expand Up @@ -40,7 +40,6 @@ function NYC (config) {
this._reportDir = config.reportDir || 'coverage'
this._sourceMap = typeof config.sourceMap === 'boolean' ? config.sourceMap : true
this._showProcessTree = config.showProcessTree || false
this._buildProcessTree = this._showProcessTree || config.buildProcessTree
this._eagerInstantiation = config.eager || false
this.cwd = config.cwd || process.cwd()
this.reporter = [].concat(config.reporter || 'text')
Expand Down Expand Up @@ -293,9 +292,7 @@ NYC.prototype.createTempDirectory = function () {
mkdirp.sync(this.tempDirectory())
if (this.cache) mkdirp.sync(this.cacheDirectory)

if (this._buildProcessTree) {
mkdirp.sync(this.processInfoDirectory())
}
mkdirp.sync(this.processInfoDirectory())
}

NYC.prototype.reset = function () {
Expand Down Expand Up @@ -351,10 +348,6 @@ NYC.prototype.writeCoverageFile = function () {
'utf-8'
)

if (!this._buildProcessTree) {
return
}

this.processInfo.coverageFilename = coverageFilename
this.processInfo.files = Object.keys(coverage)

Expand Down
6 changes: 0 additions & 6 deletions lib/config-util.js
Expand Up @@ -229,12 +229,6 @@ Config.buildYargs = function (cwd) {
type: 'boolean',
global: false
})
.option('build-process-tree', {
describe: 'create files for the tree of spawned processes',
default: false,
type: 'boolean',
global: false
})
.option('clean', {
describe: 'should the .nyc_output folder be cleaned before executing tests',
default: true,
Expand Down
70 changes: 3 additions & 67 deletions test/nyc-integration.js
Expand Up @@ -1090,70 +1090,6 @@ describe('the nyc cli', function () {
done()
})
})

it('doesn’t create the temp directory for process info files when not present', function (done) {
var args = [bin, process.execPath, 'selfspawn-fibonacci.js', '5']

var proc = spawn(process.execPath, args, {
cwd: fixturesCLI,
env: env
})

proc.on('exit', function (code) {
code.should.equal(0)
fs.stat(path.resolve(fixturesCLI, '.nyc_output', 'processinfo'), function (err, stat) {
err.code.should.equal('ENOENT')
done()
})
})
})
})

describe('--build-process-tree', function () {
it('builds, but does not display, a tree of spawned processes', function (done) {
var args = [bin, '--build-process-tree', process.execPath, 'selfspawn-fibonacci.js', '5']

var proc = spawn(process.execPath, args, {
cwd: fixturesCLI,
env: env
})

var stdout = ''
proc.stdout.setEncoding('utf8')
proc.stdout.on('data', function (chunk) {
stdout += chunk
})

proc.on('close', function (code) {
code.should.equal(0)
stdout.should.not.match(new RegExp('└─'))
const dir = path.resolve(fixturesCLI, '.nyc_output', 'processinfo')
fs.statSync(dir)
// make sure that the processinfo file has a numeric pid and ppid
const files = fs.readdirSync(dir).filter(f => f !== 'index.json')
const data = JSON.parse(fs.readFileSync(dir + '/' + files[0], 'utf8'))
data.pid.should.be.a('number')
data.ppid.should.be.a('number')
done()
})
})

it('doesn’t create the temp directory for process info files when not present', function (done) {
var args = [bin, process.execPath, 'selfspawn-fibonacci.js', '5']

var proc = spawn(process.execPath, args, {
cwd: fixturesCLI,
env: env
})

proc.on('exit', function (code) {
code.should.equal(0)
fs.stat(path.resolve(fixturesCLI, '.nyc_output', 'processinfo'), function (err, stat) {
err.code.should.equal('ENOENT')
done()
})
})
})
})

describe('--temp-dir', function () {
Expand All @@ -1174,7 +1110,7 @@ describe('the nyc cli', function () {
proc.on('close', function (code) {
code.should.equal(0)
var tempFiles = fs.readdirSync(path.resolve(fixturesCLI, '.nyc_output'))
tempFiles.length.should.equal(1)
tempFiles.length.should.equal(2) // the coverage file, and processinfo
var cliFiles = fs.readdirSync(path.resolve(fixturesCLI))
cliFiles.should.include('.nyc_output')
cliFiles.should.not.include('.temp_dir')
Expand All @@ -1194,7 +1130,7 @@ describe('the nyc cli', function () {
proc.on('exit', function (code) {
code.should.equal(0)
var tempFiles = fs.readdirSync(path.resolve(fixturesCLI, '.temp_directory'))
tempFiles.length.should.equal(1)
tempFiles.length.should.equal(2)
var cliFiles = fs.readdirSync(path.resolve(fixturesCLI))
cliFiles.should.not.include('.nyc_output')
cliFiles.should.not.include('.temp_dir')
Expand All @@ -1214,7 +1150,7 @@ describe('the nyc cli', function () {
proc.on('exit', function (code) {
code.should.equal(0)
var tempFiles = fs.readdirSync(path.resolve(fixturesCLI, '.temp_dir'))
tempFiles.length.should.equal(1)
tempFiles.length.should.equal(2)
var cliFiles = fs.readdirSync(path.resolve(fixturesCLI))
cliFiles.should.not.include('.nyc_output')
cliFiles.should.include('.temp_dir')
Expand Down
2 changes: 1 addition & 1 deletion test/processinfo.js
Expand Up @@ -14,7 +14,7 @@ t.teardown(() => rimraf.sync(resolve(fixturesCLI, tmp)))

t.test('build some processinfo', t => {
var args = [
bin, '-t', tmp, '--build-process-tree',
bin, '-t', tmp,
node, 'selfspawn-fibonacci.js', '5'
]
var proc = spawn(process.execPath, args, {
Expand Down