diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/parallel/test-debug-port-from-cmdline.js | 23 | ||||
| -rw-r--r-- | test/parallel/test-debug-signal-cluster.js | 3 |
2 files changed, 21 insertions, 5 deletions
diff --git a/test/parallel/test-debug-port-from-cmdline.js b/test/parallel/test-debug-port-from-cmdline.js index 53f35877a2f..fe22473d566 100644 --- a/test/parallel/test-debug-port-from-cmdline.js +++ b/test/parallel/test-debug-port-from-cmdline.js @@ -2,12 +2,19 @@ const common = require('../common'); const assert = require('assert'); const spawn = require('child_process').spawn; +const os = require('os'); const debugPort = common.PORT; const args = ['--interactive', '--debug-port=' + debugPort]; const childOptions = { stdio: ['pipe', 'pipe', 'pipe', 'ipc'] }; const child = spawn(process.execPath, args, childOptions); +const reDeprecationWarning = new RegExp( + /^\(node:\d+\) DeprecationWarning: /.source + + /node --debug is deprecated. /.source + + /Please use node --inspect instead.$/.source +); + child.stdin.write("process.send({ msg: 'childready' });\n"); child.stderr.on('data', function(data) { @@ -37,12 +44,20 @@ function processStderrLine(line) { } function assertOutputLines() { - const expectedLines = [ - 'Starting debugger agent.', - 'Debugger listening on 127.0.0.1:' + debugPort, + // need a var so can swap the first two lines in following + // eslint-disable-next-line no-var + var expectedLines = [ + /^Starting debugger agent.$/, + reDeprecationWarning, + new RegExp(`^Debugger listening on 127.0.0.1:${debugPort}$`) ]; + if (os.platform() === 'win32') { + expectedLines[1] = expectedLines[0]; + expectedLines[0] = reDeprecationWarning; + } + assert.strictEqual(outputLines.length, expectedLines.length); for (let i = 0; i < expectedLines.length; i++) - assert(expectedLines[i].includes(outputLines[i])); + assert(expectedLines[i].test(outputLines[i])); } diff --git a/test/parallel/test-debug-signal-cluster.js b/test/parallel/test-debug-signal-cluster.js index 89b3ca456d3..059a3c2433a 100644 --- a/test/parallel/test-debug-signal-cluster.js +++ b/test/parallel/test-debug-signal-cluster.js @@ -8,7 +8,8 @@ const path = require('path'); const port = common.PORT; const serverPath = path.join(common.fixturesDir, 'clustered-server', 'app.js'); -const args = [`--debug-port=${port}`, serverPath]; +// cannot use 'Flags: --no-deprecation' since it doesn't effect child +const args = [`--debug-port=${port}`, '--no-deprecation', serverPath]; const options = { stdio: ['inherit', 'inherit', 'pipe', 'ipc'] }; const child = spawn(process.execPath, args, options); |