From 4994d7871e403a3daa5807bd175f29a81e28ef40 Mon Sep 17 00:00:00 2001 From: Tyler Seabrook Date: Fri, 6 Oct 2017 09:49:32 -0700 Subject: [PATCH 1/2] test: update fixturesDir import Import fixturesDir path from common/fixturesDir module rather than from common. --- test/sequential/test-stream2-fs.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/sequential/test-stream2-fs.js b/test/sequential/test-stream2-fs.js index fba52a42d4f81f..2075551f05221d 100644 --- a/test/sequential/test-stream2-fs.js +++ b/test/sequential/test-stream2-fs.js @@ -20,14 +20,15 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -const common = require('../common'); +require('../common'); +const fixtures = require('../common/fixtures'); const assert = require('assert'); const fs = require('fs'); const FSReadable = fs.ReadStream; const path = require('path'); -const file = path.resolve(common.fixturesDir, 'x1024.txt'); +const file = path.resolve(fixtures.path(), 'x1024.txt'); const size = fs.statSync(file).size; From a16ad2bee5a2dcf0bcd29e582373f3b3cfb5365a Mon Sep 17 00:00:00 2001 From: James M Snell Date: Fri, 13 Oct 2017 12:53:42 -0700 Subject: [PATCH 2/2] [Squash] fix nit --- test/sequential/test-stream2-fs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/sequential/test-stream2-fs.js b/test/sequential/test-stream2-fs.js index 2075551f05221d..e2da2dca645dce 100644 --- a/test/sequential/test-stream2-fs.js +++ b/test/sequential/test-stream2-fs.js @@ -28,7 +28,7 @@ const fs = require('fs'); const FSReadable = fs.ReadStream; const path = require('path'); -const file = path.resolve(fixtures.path(), 'x1024.txt'); +const file = path.resolve(fixtures.path('x1024.txt')); const size = fs.statSync(file).size;