From 4e76478568b6c1cd8c9b7d4efc758e438668b2a5 Mon Sep 17 00:00:00 2001
From: Anatoli Papirovski <apapirovski@mac.com>
Date: Mon, 22 Jan 2018 12:12:38 -0500
Subject: [PATCH 1/2] test: fix lint issues in inspector-helper
---
test/common/inspector-helper.js | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/test/common/inspector-helper.js b/test/common/inspector-helper.js
index 5e927f215055b9..5963312d706598 100644
--- a/test/common/inspector-helper.js
+++ b/test/common/inspector-helper.js
@@ -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 { parse: parseURL } = require('url');
const { getURLFromFilePath } = require('internal/url');
-const path = require('path');
const _MAINSCRIPT = fixtures.path('loop.js');
const DEBUG = false;
@@ -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 (
+ getURLFromFilePath(url).toString() === this.scriptURL().toString()
+ ) {
this.mainScriptId = scriptId;
}
}
@@ -246,8 +247,9 @@ 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(),
+ `${scriptPath} !== ${expectedScriptPath}`);
assert.strictEqual(line, location['lineNumber']);
return true;
}
From 2f14c9454efdf65ecbf934f466d4d5a984ca1ae5 Mon Sep 17 00:00:00 2001
From: Anatoli Papirovski <apapirovski@mac.com>
Date: Mon, 22 Jan 2018 12:29:12 -0500
Subject: [PATCH 2/2] test: fix broken test
---
test/common/inspector-helper.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/common/inspector-helper.js b/test/common/inspector-helper.js
index 5963312d706598..52e9d01b87dd7e 100644
--- a/test/common/inspector-helper.js
+++ b/test/common/inspector-helper.js
@@ -172,9 +172,9 @@ class InspectorSession {
const scriptId = script['scriptId'];
const url = script['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;
}
}