Skip to content

test: Fix broken test cases from #18194 #18295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
guybedford wants to merge 1 commit into from
Closed

test: Fix broken test cases from #18194 #18295

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions test/common/inspector-helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ const fs = require('fs');
const http = require('http');
const fixtures = require('../common/fixtures');
const { spawn } = require('child_process');
const { URL, parse: parseURL } = require('url');
const url = require('url');
const { getURLFromFilePath } = require('internal/url');
const path = require('path');

const _MAINSCRIPT = fixtures.path('loop.js');
const DEBUG = false;
Expand Down Expand Up @@ -173,7 +172,9 @@ class InspectorSession {
const scriptId = script['scriptId'];
const url = script['url'];
this._scriptsIdsByUrl.set(scriptId, url);
if (getURLFromFilePath(url).toString() === this.scriptURL().toString()) {
if (this.scriptURL().toString() ===
url.startsWith('file:') ? url :
getURLFromFilePath(url).toString()) {
this.mainScriptId = scriptId;
}
}
Expand Down Expand Up @@ -246,8 +247,7 @@ class InspectorSession {
const callFrame = message['params']['callFrames'][0];
const location = callFrame['location'];
const scriptPath = this._scriptsIdsByUrl.get(location['scriptId']);
assert(scriptPath.toString() === expectedScriptPath.toString(),
`${scriptPath} !== ${expectedScriptPath}`);
assert.strictEqual(scriptPath.toString(), expectedScriptPath.toString());
assert.strictEqual(line, location['lineNumber']);
return true;
}
Expand Down Expand Up @@ -306,6 +306,9 @@ class InspectorSession {
}

scriptURL() {
const scriptPath = this.scriptPath();
if (scriptPath.startsWith('file:'))
return scriptPath;
return getURLFromFilePath(this.scriptPath());
}
}
Expand Down Expand Up @@ -394,7 +397,7 @@ class NodeInstance {
const port = await this.portPromise;
return http.get({
port,
path: parseURL(devtoolsUrl).path,
path: url.parse(devtoolsUrl).path,
headers: {
'Connection': 'Upgrade',
'Upgrade': 'websocket',
Expand Down