test: use common.fixtures module in test-preload

lzcabrera · MylesBorins · commit 75ab6c00a9b9 · 2017-10-11T02:05:54.000-04:00
PR-URL: #15975 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
diff --git a/test/parallel/test-preload.js b/test/parallel/test-preload.js
@@ -1,12 +1,12 @@
 'use strict';
 
 const common = require('../common');
+const fixtures = require('../common/fixtures');
 // Refs: https://github.com/nodejs/node/pull/2253
 if (common.isSunOS)
   common.skip('unreliable on SunOS');
 
 const assert = require('assert');
-const path = require('path');
 const childProcess = require('child_process');
 
 const nodeBinary = process.argv[0];
@@ -19,13 +19,11 @@ const preloadOption = (preloads) => {
   return option;
 };
 
-const fixture = (name) => path.join(common.fixturesDir, name);
-
-const fixtureA = fixture('printA.js');
-const fixtureB = fixture('printB.js');
-const fixtureC = fixture('printC.js');
-const fixtureD = fixture('define-global.js');
-const fixtureThrows = fixture('throws_error4.js');
+const fixtureA = fixtures.path('printA.js');
+const fixtureB = fixtures.path('printB.js');
+const fixtureC = fixtures.path('printC.js');
+const fixtureD = fixtures.path('define-global.js');
+const fixtureThrows = fixtures.path('throws_error4.js');
 
 // test preloading a single module works
 childProcess.exec(`"${nodeBinary}" ${preloadOption([fixtureA])} "${fixtureB}"`,
@@ -124,19 +122,19 @@ interactive.stdin.write('a\n');
 interactive.stdin.write('process.exit()\n');
 
 childProcess.exec(
-  `"${nodeBinary}" --require "${fixture('cluster-preload.js')}" "${
-    fixture('cluster-preload-test.js')}"`,
+  `"${nodeBinary}" --require "${fixtures.path('cluster-preload.js')}" "${
+    fixtures.path('cluster-preload-test.js')}"`,
   function(err, stdout, stderr) {
     assert.ifError(err);
     assert.ok(/worker terminated with code 43/.test(stdout));
   }
 );
 
 // https://github.com/nodejs/node/issues/1691
-process.chdir(common.fixturesDir);
+process.chdir(fixtures.fixturesDir);
 childProcess.exec(
   `"${nodeBinary}" --expose_natives_as=v8natives --require ` +
-     `"${fixture('cluster-preload.js')}" cluster-preload-test.js`,
+     `"${fixtures.path('cluster-preload.js')}" cluster-preload-test.js`,
   function(err, stdout, stderr) {
     assert.ifError(err);
     assert.ok(/worker terminated with code 43/.test(stdout));
