Skip to content

Commit

Permalink
Always load graceful-fs BEFORE tap in tests
Browse files Browse the repository at this point in the history
This prevents issues where a graceful-fs deep in tap's
dep chain ends up hijacking our test environment variable.
  • Loading branch information
isaacs committed Jun 26, 2019
1 parent c7b3374 commit 849d672
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion test/chown-er-ok.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
var t = require('tap')
var realFs = require('fs')

var methods = ['chown', 'chownSync', 'chmod', 'chmodSync']
Expand Down Expand Up @@ -26,6 +25,7 @@ function makeErr (path, method) {
}

var fs = require('../')
var t = require('tap')

var errs = ['ENOSYS', 'EINVAL', 'EPERM']
t.plan(errs.length * methods.length)
Expand Down
2 changes: 1 addition & 1 deletion test/close.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var test = require('tap').test
var fs$close = require('fs').close;
var fs$closeSync = require('fs').closeSync;
var fs = require('../');
var test = require('tap').test

test('`close` is patched correctly', function(t) {
t.notEqual(fs.close, fs$close, 'patch close');
Expand Down
2 changes: 1 addition & 1 deletion test/enoent.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// this test makes sure that various things get enoent, instead of
// some other kind of throw.

var t = require('tap')
var g = require('../')

var NODE_VERSION_MAJOR_WITH_BIGINT = 10
Expand All @@ -27,6 +26,7 @@ function nodeSupportsBigInt () {
return false
}

var t = require('tap')
var file = 'this file does not exist even a little bit'
var methods = [
['open', 'r'],
Expand Down
2 changes: 1 addition & 1 deletion test/max-open.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var test = require('tap').test
var fs = require('../')
var test = require('tap').test

test('open lots of stuff', function (t) {
// Get around EBADF from libuv by making sure that stderr is opened
Expand Down
2 changes: 1 addition & 1 deletion test/open.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var test = require('tap').test
var fs = require('../')
var test = require('tap').test

test('open an existing file works', function (t) {
var fd = fs.openSync(__filename, 'r')
Expand Down
2 changes: 1 addition & 1 deletion test/readdir-options.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var t = require("tap")
var fs = require("fs")
var t = require("tap")

var currentTest

Expand Down
2 changes: 1 addition & 1 deletion test/readdir-sort.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
var test = require("tap").test
var fs = require("fs")

var readdir = fs.readdir
Expand All @@ -9,6 +8,7 @@ fs.readdir = function(path, cb) {
}

var g = require("../")
var test = require("tap").test

test("readdir reorder", function (t) {
g.readdir("whatevers", function (er, files) {
Expand Down
2 changes: 1 addition & 1 deletion test/stats-uid-gid.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';
var test = require('tap').test
var util = require('util')
var fs = require('fs')
var test = require('tap').test

// mock fs.statSync to return signed uids/gids
var realStatSync = fs.statSync
Expand Down
2 changes: 1 addition & 1 deletion test/stats.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var test = require('tap').test
var fs = require('fs')
var gfs = require('../graceful-fs.js')
var test = require('tap').test

test('graceful fs uses same stats constructor as fs', function (t) {
t.equal(gfs.Stats, fs.Stats, 'should reference the same constructor')
Expand Down

0 comments on commit 849d672

Please sign in to comment.