mirror of
https://github.com/zebrajr/node.git
synced 2026-01-15 12:15:26 +00:00
test: fix and improve debugger-client test
This test expects the string 'Debugger listening on port' on stderr and since the message has been changed to 'Debugger listening on host:port' this was failing always. Apart from that, this test expects the main script's name to be `src/node.js`, but that has been renamed to `lib/internal/node.js` and then to `lib/internal/bootstrap_node.js`. So, the script name has been updated. Apart from that, using `const` instead of `var` wherever possible. Refer: https://github.com/nodejs/node/issues/10361 PR-URL: https://github.com/nodejs/node/pull/10371 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
parent
f5011786ba
commit
3ef4ec0e93
@@ -16,7 +16,7 @@ setTimeout(function() {
|
||||
|
||||
let resCount = 0;
|
||||
const p = new debug.Protocol();
|
||||
p.onResponse = function(res) {
|
||||
p.onResponse = function() {
|
||||
resCount++;
|
||||
};
|
||||
|
||||
@@ -89,7 +89,7 @@ function addTest(cb) {
|
||||
addTest(function(client, done) {
|
||||
console.error('requesting version');
|
||||
client.reqVersion(function(err, v) {
|
||||
assert.ok(!err);
|
||||
assert.ifError(err);
|
||||
console.log('version: %s', v);
|
||||
assert.strictEqual(process.versions.v8, v);
|
||||
done();
|
||||
@@ -99,13 +99,13 @@ addTest(function(client, done) {
|
||||
addTest(function(client, done) {
|
||||
console.error('requesting scripts');
|
||||
client.reqScripts(function(err) {
|
||||
assert.ok(!err);
|
||||
assert.ifError(err);
|
||||
console.error('got %d scripts', Object.keys(client.scripts).length);
|
||||
|
||||
let foundMainScript = false;
|
||||
for (const k in client.scripts) {
|
||||
const script = client.scripts[k];
|
||||
if (script && script.name === 'node.js') {
|
||||
if (script && script.name === 'bootstrap_node.js') {
|
||||
foundMainScript = true;
|
||||
break;
|
||||
}
|
||||
@@ -119,7 +119,7 @@ addTest(function(client, done) {
|
||||
console.error('eval 2+2');
|
||||
client.reqEval('2+2', function(err, res) {
|
||||
console.error(res);
|
||||
assert.ok(!err);
|
||||
assert.ifError(err);
|
||||
assert.strictEqual(res.text, '4');
|
||||
assert.strictEqual(res.value, 4);
|
||||
done();
|
||||
@@ -137,7 +137,7 @@ function doTest(cb, done) {
|
||||
const args = ['--debug=' + debugPort, '-e', script];
|
||||
nodeProcess = spawn(process.execPath, args);
|
||||
|
||||
nodeProcess.stdout.once('data', function(c) {
|
||||
nodeProcess.stdout.once('data', function() {
|
||||
console.log('>>> new node process: %d', nodeProcess.pid);
|
||||
let failed = true;
|
||||
try {
|
||||
@@ -158,7 +158,7 @@ function doTest(cb, done) {
|
||||
console.error('got stderr data %j', data);
|
||||
nodeProcess.stderr.resume();
|
||||
b += data;
|
||||
if (didTryConnect === false && b.match(/Debugger listening on port/)) {
|
||||
if (didTryConnect === false && b.match(/Debugger listening on /)) {
|
||||
didTryConnect = true;
|
||||
|
||||
// The timeout is here to expose a race in the bootstrap process.
|
||||
@@ -168,10 +168,10 @@ function doTest(cb, done) {
|
||||
|
||||
function tryConnect() {
|
||||
// Wait for some data before trying to connect
|
||||
var c = new debug.Client();
|
||||
const c = new debug.Client();
|
||||
console.error('>>> connecting...');
|
||||
c.connect(debug.port);
|
||||
c.on('break', function(brk) {
|
||||
c.on('break', function() {
|
||||
c.reqContinue(function() {});
|
||||
});
|
||||
c.on('ready', function() {
|
||||
@@ -199,7 +199,7 @@ function doTest(cb, done) {
|
||||
|
||||
|
||||
function run() {
|
||||
var t = tests[0];
|
||||
const t = tests[0];
|
||||
if (!t) return;
|
||||
|
||||
doTest(t, function() {
|
||||
|
||||
Reference in New Issue
Block a user