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

test: avoid empty fixture in module test

Browse Source 
Refactor test-module-loading to use tmpdir for its empty directory
rather than using a not-actually-empty directory called "empty" in
fixtures.

PR-URL: https://github.com/nodejs/node/pull/21044
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
This commit is contained in:
Rich Trott 2018-05-30 15:19:33 +02:00
parent de8ef3f954
commit c903a9e0c0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/sequential/test-module-loading.js
View File

@ -21,9 +21,11 @@
'use strict'; 'use strict';
const common = require('../common'); const common = require('../common');
const tmpdir = require('../common/tmpdir');
const assert = require('assert'); const assert = require('assert');
const path = require('path');
const fs = require('fs'); const fs = require('fs');
const path = require('path');
const backslash = /\\/g; const backslash = /\\/g;
@ -168,9 +170,10 @@ assert.strictEqual(require('../fixtures/foo').foo, 'ok',
// Should not attempt to load a directory // Should not attempt to load a directory
try { try {
require('../fixtures/empty'); tmpdir.refresh();
require(tmpdir.path);
} catch (err) { } catch (err) {
assert.strictEqual(err.message, 'Cannot find module \'../fixtures/empty\''); assert.strictEqual(err.message, `Cannot find module '${tmpdir.path}'`);
} }
{ {
@ -284,7 +287,6 @@ try {
'fixtures/registerExt.test': {}, 'fixtures/registerExt.test': {},
'fixtures/registerExt.hello.world': {}, 'fixtures/registerExt.hello.world': {},
'fixtures/registerExt2.test': {}, 'fixtures/registerExt2.test': {},
'fixtures/empty.js': {},
'fixtures/module-load-order/file1': {}, 'fixtures/module-load-order/file1': {},
'fixtures/module-load-order/file2.js': {}, 'fixtures/module-load-order/file2.js': {},
'fixtures/module-load-order/file3.node': {}, 'fixtures/module-load-order/file3.node': {},