Skip to content

Commit f715679

Browse files
committed
reenable tests on workers
1 parent fd5ffdf commit f715679

4 files changed

Lines changed: 11 additions & 21 deletions

File tree

test/es-module/test-esm-loader-mock.mjs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
import { skipIfWorker } from '../common/index.mjs';
1+
import '../common/index.mjs';
22
import assert from 'node:assert/strict';
33
import { mock } from '../fixtures/es-module-loaders/mock.mjs';
4-
// Importing mock.mjs above will call `register` to modify the loaders chain.
5-
// Modifying the loader chain is not supported currently when running from a worker thread.
6-
// Relevant PR: https://github.com/nodejs/node/pull/52706
7-
// See comment: https://github.com/nodejs/node/pull/52706/files#r1585144580
8-
skipIfWorker();
94

105
mock('node:events', {
116
EventEmitter: 'This is mocked!'

test/es-module/test-esm-named-exports.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// Flags: --import ./test/fixtures/es-module-loaders/builtin-named-exports.mjs
22
'use strict';
33

4-
const common = require('../common');
5-
common.skipIfWorker();
4+
require('../common');
65

76
const { readFile, __fromLoader } = require('fs');
87
const assert = require('assert');
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
// Flags: --import ./test/fixtures/es-module-loaders/builtin-named-exports.mjs
2-
import { skipIfWorker } from '../common/index.mjs';
3-
import * as fs from 'fs';
2+
import '../common/index.mjs';
3+
import { readFile, __fromLoader } from 'fs';
44
import assert from 'assert';
55
import ok from '../fixtures/es-modules/test-esm-ok.mjs';
6-
skipIfWorker();
76

87
assert(ok);
9-
assert(fs.readFile);
10-
assert(fs.__fromLoader);
8+
assert(readFile);
9+
assert(__fromLoader);
Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { isMainThread } from '../../common/index.mjs';
21
import * as fixtures from '../../common/fixtures.mjs';
32
import { createRequire, register } from 'node:module';
43

@@ -11,10 +10,8 @@ Object.defineProperty(globalThis, GET_BUILTIN, {
1110
configurable: false,
1211
});
1312

14-
if (isMainThread) {
15-
register(fixtures.fileURL('es-module-loaders/builtin-named-exports-loader.mjs'), {
16-
data: {
17-
GET_BUILTIN,
18-
},
19-
});
20-
}
13+
register(fixtures.fileURL('es-module-loaders/builtin-named-exports-loader.mjs'), {
14+
data: {
15+
GET_BUILTIN,
16+
},
17+
});

0 commit comments

Comments
 (0)