From eb690b13351b226f0e687a858e4b0a919adac0ac Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Mon, 10 Oct 2016 23:23:18 -0700
Subject: [PATCH] test: move module out of fixture directory

tick-processor-base.js is a module used by three other tests. It is not
a test fixture so move it out of the fixture directory. (One downside to
having it in the fixture directory is that fixture code is not currently
linted.)

It is possible that the code in tick-processor-base.js should be
integrated into common.js. This can potentially happen subsequently (and
might make a reasonable good first contribution for a new contributor).

PR-URL: https://github.com/nodejs/node/pull/9022
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/parallel/test-tick-processor-builtin.js       | 3 +--
 test/parallel/test-tick-processor-cpp-core.js      | 3 +--
 test/parallel/test-tick-processor-unknown.js       | 3 +--
 test/{fixtures => parallel}/tick-processor-base.js | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)
 rename test/{fixtures => parallel}/tick-processor-base.js (92%)

diff --git a/test/parallel/test-tick-processor-builtin.js b/test/parallel/test-tick-processor-builtin.js
index 8e6a5313dea..afe08bdb0b6 100644
--- a/test/parallel/test-tick-processor-builtin.js
+++ b/test/parallel/test-tick-processor-builtin.js
@@ -1,6 +1,5 @@
 'use strict';
 const common = require('../common');
-const path = require('path');
 
 if (common.isWindows ||
     common.isSunOS ||
@@ -16,7 +15,7 @@ if (!common.enoughTestCpu) {
   return;
 }
 
-const base = require(path.join(common.fixturesDir, 'tick-processor-base.js'));
+const base = require('./tick-processor-base.js');
 
 base.runTest({
   pattern: /Builtin_DateNow/,
diff --git a/test/parallel/test-tick-processor-cpp-core.js b/test/parallel/test-tick-processor-cpp-core.js
index 6223808da0c..2bc595e7ff7 100644
--- a/test/parallel/test-tick-processor-cpp-core.js
+++ b/test/parallel/test-tick-processor-cpp-core.js
@@ -1,6 +1,5 @@
 'use strict';
 const common = require('../common');
-const path = require('path');
 
 if (common.isWindows ||
     common.isSunOS ||
@@ -16,7 +15,7 @@ if (!common.enoughTestCpu) {
   return;
 }
 
-const base = require(path.join(common.fixturesDir, 'tick-processor-base.js'));
+const base = require('./tick-processor-base.js');
 
 base.runTest({
   pattern: /RunInDebugContext/,
diff --git a/test/parallel/test-tick-processor-unknown.js b/test/parallel/test-tick-processor-unknown.js
index d1d1f4e6325..c886f648be4 100644
--- a/test/parallel/test-tick-processor-unknown.js
+++ b/test/parallel/test-tick-processor-unknown.js
@@ -1,6 +1,5 @@
 'use strict';
 const common = require('../common');
-const path = require('path');
 
 // TODO(mhdawson) Currently the test-tick-processor functionality in V8
 // depends on addresses being smaller than a full 64 bits.  Aix supports
@@ -17,7 +16,7 @@ if (!common.enoughTestCpu) {
   return;
 }
 
-const base = require(path.join(common.fixturesDir, 'tick-processor-base.js'));
+const base = require('./tick-processor-base.js');
 
 // Unknown checked for to prevent flakiness, if pattern is not found,
 // then a large number of unknown ticks should be present
diff --git a/test/fixtures/tick-processor-base.js b/test/parallel/tick-processor-base.js
similarity index 92%
rename from test/fixtures/tick-processor-base.js
rename to test/parallel/tick-processor-base.js
index ca67a0f7e96..aff37ba109e 100644
--- a/test/fixtures/tick-processor-base.js
+++ b/test/parallel/tick-processor-base.js
@@ -20,7 +20,7 @@ function runTest(test) {
   });
 
   let ticks = '';
-  proc.stdout.on('data', chunk => ticks += chunk);
+  proc.stdout.on('data', (chunk) => ticks += chunk);
 
   // Try to match after timeout
   setTimeout(() => {
@@ -41,7 +41,7 @@ function match(pattern, parent, ticks) {
   });
 
   let out = '';
-  proc.stdout.on('data', chunk => out += chunk);
+  proc.stdout.on('data', (chunk) => out += chunk);
   proc.stdout.once('end', () => {
     proc.once('exit', () => {
       fs.unlinkSync(LOG_FILE);