Skip to content
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

Jump to bottom

remove empty-directory fixture #21044

Closed
wants to merge 3 commits into from
Closed

remove empty-directory fixture #21044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffa668a
test: avoid empty fixture in fs test
Trott May 30, 2018
079f431
test: avoid empty fixture in module test
Trott May 30, 2018
7f736d5
test: remove unused empty fixture
Trott May 30, 2018
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
Empty file removed test/fixtures/empty/.gitkeep
View file
Open in desktop
Empty file.
6 changes: 5 additions & 1 deletion test/parallel/test-fs-error-messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,17 @@
'use strict';
const common = require('../common');
const fixtures = require('../common/fixtures');
const tmpdir = require('../common/tmpdir');
const assert = require('assert');
const fs = require('fs');

tmpdir.refresh();

const nonexistentFile = fixtures.path('non-existent');
const nonexistentDir = fixtures.path('non-existent', 'foo', 'bar');
const existingFile = fixtures.path('exit.js');
const existingFile2 = fixtures.path('create-file.js');
const existingDir = fixtures.path('empty');
const existingDir = tmpdir.path;
const existingDir2 = fixtures.path('keys');
const { COPYFILE_EXCL } = fs.constants;
const uv = process.binding('uv');
Expand Down
10 changes: 6 additions & 4 deletions test/sequential/test-module-loading.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@

'use strict';
const common = require('../common');
const tmpdir = require('../common/tmpdir');

const assert = require('assert');
const path = require('path');
const fs = require('fs');
const path = require('path');

const backslash = /\\/g;

Expand Down Expand Up @@ -168,9 +170,10 @@ assert.strictEqual(require('../fixtures/foo').foo, 'ok',

// Should not attempt to load a directory
try {
require('../fixtures/empty');
tmpdir.refresh();
require(tmpdir.path);
} catch (err) {
assert.strictEqual(err.message, 'Cannot find module \'../fixtures/empty\'');
assert.strictEqual(err.message, `Cannot find module '${tmpdir.path}'`);
}

{
Expand Down Expand Up @@ -284,7 +287,6 @@ try {
'fixtures/registerExt.test': {},
'fixtures/registerExt.hello.world': {},
'fixtures/registerExt2.test': {},
'fixtures/empty.js': {},
'fixtures/module-load-order/file1': {},
'fixtures/module-load-order/file2.js': {},
'fixtures/module-load-order/file3.node': {},
Expand Down