Skip to content

Commit

Permalink
test: fix improper path to URL conversion
Browse files Browse the repository at this point in the history
PR-URL: #54509
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
aduh95 authored and RafaelGSS committed Aug 30, 2024
1 parent 1800a58 commit 02d664b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
3 changes: 2 additions & 1 deletion test/fixtures/permission/fs-read.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ const common = require('../../common');
const assert = require('assert');
const fs = require('fs');
const path = require('path');
const { pathToFileURL } = require('url');

const blockedFile = process.env.BLOCKEDFILE;
const bufferBlockedFile = Buffer.from(process.env.BLOCKEDFILE);
const blockedFileURL = new URL('file://' + process.env.BLOCKEDFILE);
const blockedFileURL = pathToFileURL(process.env.BLOCKEDFILE);
const blockedFolder = process.env.BLOCKEDFOLDER;
const allowedFolder = process.env.ALLOWEDFOLDER;
const regularFile = __filename;
Expand Down
6 changes: 2 additions & 4 deletions test/parallel/test-diagnostics-channel-module-import-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
const common = require('../common');
const assert = require('assert');
const dc = require('diagnostics_channel');
const { pathToFileURL } = require('url');

const trace = dc.tracingChannel('module.import');
const events = [];
Expand Down Expand Up @@ -30,10 +31,7 @@ trace.subscribe({
import('does-not-exist').then(
common.mustNotCall(),
common.mustCall((error) => {
let expectedParentURL = module.filename.replaceAll('\\', '/');
expectedParentURL = common.isWindows ?
`file:///${expectedParentURL}` :
`file://${expectedParentURL}`;
const expectedParentURL = pathToFileURL(module.filename).href;
// Verify order and contents of each event
assert.deepStrictEqual(events, [
{
Expand Down
6 changes: 2 additions & 4 deletions test/parallel/test-diagnostics-channel-module-import.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
const common = require('../common');
const assert = require('assert');
const dc = require('diagnostics_channel');
const { pathToFileURL } = require('url');

const trace = dc.tracingChannel('module.import');
const events = [];
Expand Down Expand Up @@ -29,10 +30,7 @@ trace.subscribe({

import('http').then(
common.mustCall((result) => {
let expectedParentURL = module.filename.replaceAll('\\', '/');
expectedParentURL = common.isWindows ?
`file:///${expectedParentURL}` :
`file://${expectedParentURL}`;
const expectedParentURL = pathToFileURL(module.filename).href;
// Verify order and contents of each event
assert.deepStrictEqual(events, [
{
Expand Down

0 comments on commit 02d664b

Please sign in to comment.