Skip to content

Commit

Permalink
peer review changes; retry tests on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
boneskull committed Feb 4, 2019
1 parent 233eba9 commit 708ff2e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 14 deletions.
2 changes: 1 addition & 1 deletion bin/mocha
Expand Up @@ -37,7 +37,7 @@ debug('loaded opts', opts);
const disableTimeouts = value => {
if (impliesNoTimeouts(value)) {
debug(`option "${value}" disabled timeouts`);
mochaArgs.timeout = false;
mochaArgs.timeout = 0;
delete mochaArgs.timeouts;
delete mochaArgs.t;
}
Expand Down
19 changes: 6 additions & 13 deletions test/integration/options/debug.spec.js
Expand Up @@ -3,15 +3,8 @@
var helpers = require('../helpers');
var invokeMocha = helpers.invokeMocha;
var DEFAULT_FIXTURE = helpers.DEFAULT_FIXTURE;
var platform = require('os').platform();

describe('--debug', function() {
before(function() {
if (platform === 'win32') {
this.skip();
}
});

describe('Node.js v8+', function() {
before(function() {
if (process.version.substring(0, 2) === 'v6') {
Expand Down Expand Up @@ -54,8 +47,8 @@ describe('--debug', function() {

// debugger must be manually killed
setTimeout(function() {
proc.kill('SIGINT');
}, 1000);
process.kill(proc.pid, 'SIGINT');
}, 2000);
});

it('should respect custom host/port', function(done) {
Expand Down Expand Up @@ -119,8 +112,8 @@ describe('--debug', function() {

// debugger must be manually killed
setTimeout(function() {
proc.kill('SIGINT');
}, 1000);
process.kill(proc.pid, 'SIGINT');
}, 2000);
});

it('should respect custom host/port', function(done) {
Expand All @@ -140,8 +133,8 @@ describe('--debug', function() {
);

setTimeout(function() {
proc.kill('SIGINT');
}, 1000);
process.kill(proc.pid, 'SIGINT');
}, 2000);
});
});
});

0 comments on commit 708ff2e

Please sign in to comment.