test: make tests cwd-independent

vsemozhetbyt · MylesBorins · commit fc9e7a98ed13 · 2017-07-11T17:43:45.000+01:00
PR-URL: #12812 Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
diff --git a/test/doctool/test-doctool-html.js b/test/doctool/test-doctool-html.js
@@ -94,7 +94,7 @@ testData.forEach((item) => {
         {
           input: preprocessed,
           filename: 'foo',
-          template: 'doc/template.html',
+          template: path.resolve(__dirname, '../../doc/template.html'),
           nodeVersion: process.version,
           analytics: item.analyticsId,
         },
diff --git a/test/parallel/test-cli-eval.js b/test/parallel/test-cli-eval.js
@@ -73,13 +73,16 @@ child.exec(`${nodejs} --print "os.platform()"`,
            }));
 
 // Module path resolve bug regression test.
+const cwd = process.cwd();
+process.chdir(path.resolve(__dirname, '../../'));
 child.exec(`${nodejs} --eval "require('./test/parallel/test-cli-eval.js')"`,
            common.mustCall((err, stdout, stderr) => {
              assert.strictEqual(err.code, 42);
              assert.strictEqual(
                stdout, 'Loaded as a module, exiting with status code 42.\n');
              assert.strictEqual(stderr, '');
            }));
+process.chdir(cwd);
 
 // Missing argument should not crash.
 child.exec(`${nodejs} -e`, common.mustCall((err, stdout, stderr) => {
diff --git a/test/parallel/test-process-chdir.js b/test/parallel/test-process-chdir.js
@@ -5,6 +5,7 @@ const assert = require('assert');
 const fs = require('fs');
 const path = require('path');
 
+process.chdir('..');
 assert.notStrictEqual(process.cwd(), __dirname);
 process.chdir(__dirname);
 assert.strictEqual(process.cwd(), __dirname);

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ testData.forEach((item) => {`
`94`	`94`	`{`
`95`	`95`	`input: preprocessed,`
`96`	`96`	`filename: 'foo',`
`97`		`- template: 'doc/template.html',`
	`97`	`+ template: path.resolve(__dirname, '../../doc/template.html'),`
`98`	`98`	`nodeVersion: process.version,`
`99`	`99`	`analytics: item.analyticsId,`
`100`	`100`	`},`