1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: fix a bug & lint issues in inspector-helper

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/18293
Reviewed-By: Eugene Ostroukhov <eostroukhov@google.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Guy Bedford <guybedford@gmail.com>
This commit is contained in:
Anatoli Papirovski 2018-01-22 12:12:38 -05:00
parent e7ff00d0c5
commit a3555d0583
No known key found for this signature in database
GPG Key ID: 614E2E1ABEB4B2C0
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/common/inspector-helper.js
View File

@ -5,9 +5,8 @@ const fs = require('fs');
const http = require('http'); const http = require('http');
const fixtures = require('../common/fixtures'); const fixtures = require('../common/fixtures');
const { spawn } = require('child_process'); const { spawn } = require('child_process');
const { URL, parse: parseURL } = require('url'); const { parse: parseURL } = require('url');
const { getURLFromFilePath } = require('internal/url'); const { getURLFromFilePath } = require('internal/url');
const path = require('path');
const _MAINSCRIPT = fixtures.path('loop.js'); const _MAINSCRIPT = fixtures.path('loop.js');
const DEBUG = false; const DEBUG = false;
@ -173,7 +172,9 @@ class InspectorSession {
const scriptId = script['scriptId']; const scriptId = script['scriptId'];
const url = script['url']; const url = script['url'];
this._scriptsIdsByUrl.set(scriptId, url); this._scriptsIdsByUrl.set(scriptId, url);
if (getURLFromFilePath(url).toString() === this.scriptURL().toString()) { const fileUrl = url.startsWith('file:') ?
url : getURLFromFilePath(url).toString();
if (fileUrl === this.scriptURL().toString()) {
this.mainScriptId = scriptId; this.mainScriptId = scriptId;
} }
} }
@ -246,8 +247,9 @@ class InspectorSession {
const callFrame = message['params']['callFrames'][0]; const callFrame = message['params']['callFrames'][0];
const location = callFrame['location']; const location = callFrame['location'];
const scriptPath = this._scriptsIdsByUrl.get(location['scriptId']); const scriptPath = this._scriptsIdsByUrl.get(location['scriptId']);
assert(scriptPath.toString() === expectedScriptPath.toString(), assert.strictEqual(scriptPath.toString(),
`${scriptPath} !== ${expectedScriptPath}`); expectedScriptPath.toString(),
`${scriptPath} !== ${expectedScriptPath}`);
assert.strictEqual(line, location['lineNumber']); assert.strictEqual(line, location['lineNumber']);
return true; return true;
} }