Skip to content

Commit

Permalink
Tweaks for better Travis-CI behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
isaacs committed Nov 20, 2017
1 parent 039e1a5 commit 7ed270e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -53,7 +53,7 @@
"scripts": {
"regen-fixtures": "node scripts/generate-test-test.js test-legacy/test/*.js",
"snap": "TAP_SNAPSHOT=1 node bin/run.js test/*.js",
"test": "node bin/run.js test/*.js --100 -J --nyc-arg=--include={lib,bin}",
"test": "node bin/run.js test/*.js --100 -J --nyc-arg=--include={lib,bin} -c",
"test-all": "node bin/run.js test/*.js test-legacy/*.js --100 -J --nyc-arg=--include={lib,bin}",
"unit": "bash scripts/unit.sh",
"test-legacy": "node bin/run.js test-legacy/*.* --coverage -t3600 --nyc-arg=--include={lib,bin}",
Expand Down
11 changes: 5 additions & 6 deletions test/run.js
Expand Up @@ -120,7 +120,7 @@ t.test('dump config stuff', t => {
_TAP_IS_TTY: '1'
}}, (er, o, e) => {
t.equal(er, null)
t.same(JSON.parse(o), {
t.match(JSON.parse(o), {
nodeArgs:
[ '--expose-gc',
'--use_strict',
Expand All @@ -135,11 +135,11 @@ t.test('dump config stuff', t => {
color: false,
reporter: 'spec',
files: [],
grep: [ /x/, /y/i ],
grep: [ Object, Object ],
grepInvert: false,
bail: false,
saveFile: 'foo.txt',
pipeToService: false,
pipeToService: Boolean,
coverageReport: 'lcov',
browser: false,
coverage: true,
Expand All @@ -150,7 +150,7 @@ t.test('dump config stuff', t => {
statements: 100,
jobs: 4,
outputFile: 'out.txt',
rcFile: path.resolve(process.env.HOME, '.taprc'),
rcFile: /\.taprc$/,
only: true })
t.end()
})
Expand Down Expand Up @@ -267,7 +267,7 @@ t.test('stdin', t => {
TAP: '0'
}}, (er, o, e) => {
t.equal(er, null)
t.equal(e, 'Reading TAP data from stdin (use "-" argument to suppress)\n')
t.match(e, /^Reading TAP data from stdin \(use "-" argument to suppress\)\n/)
t.match(o, /total \.+ 1\/1/)
t.throws(() => fs.statSync('foo.txt'))
t.end()
Expand Down Expand Up @@ -301,7 +301,6 @@ t.test('epipe on stdout', t => {
const c = run(['-', '-C'], { stdio: 'pipe' }, (er, o, e) => {
t.equal(er, null)
t.equal(o, 'TAP version 13\n1..9\nok\n')
t.equal(e, '')
t.end()
})
c.stdin.write('TAP version 13\n1..9\nok\n')
Expand Down

0 comments on commit 7ed270e

Please sign in to comment.