From 7bd09d10e3f99fa621c7362219de550b0ca75129 Mon Sep 17 00:00:00 2001 From: John Miller Date: Fri, 6 Oct 2017 10:49:44 -0700 Subject: [PATCH 1/3] replacing common module with fixtures module for cmd string building --- test/parallel/test-error-reporting.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/parallel/test-error-reporting.js b/test/parallel/test-error-reporting.js index 8a961299793bb8..6040244bc2ef65 100644 --- a/test/parallel/test-error-reporting.js +++ b/test/parallel/test-error-reporting.js @@ -21,12 +21,14 @@ 'use strict'; const common = require('../common'); +const fixtures = require('../common/fixtures'); const assert = require('assert'); const exec = require('child_process').exec; const path = require('path'); function errExec(script, callback) { - const cmd = `"${process.argv[0]}" "${path.join(common.fixturesDir, script)}"`; + const cmd = `"${process.argv[0]}" ` + + `"${path.join(fixtures.fixturesDir, script)}"`; return exec(cmd, function(err, stdout, stderr) { // There was some error assert.ok(err); From 6c37530a9753d6d690f19224a14f97ad6ca0b6fc Mon Sep 17 00:00:00 2001 From: John Miller Date: Fri, 6 Oct 2017 12:03:03 -0700 Subject: [PATCH 2/3] fixing fixtures to use path for cmd --- test/parallel/test-error-reporting.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/parallel/test-error-reporting.js b/test/parallel/test-error-reporting.js index 6040244bc2ef65..739990a7c24dfa 100644 --- a/test/parallel/test-error-reporting.js +++ b/test/parallel/test-error-reporting.js @@ -24,11 +24,9 @@ const common = require('../common'); const fixtures = require('../common/fixtures'); const assert = require('assert'); const exec = require('child_process').exec; -const path = require('path'); function errExec(script, callback) { - const cmd = `"${process.argv[0]}" ` + - `"${path.join(fixtures.fixturesDir, script)}"`; + const cmd = `"${process.argv[0]}" "${fixtures.path(script)}"`; return exec(cmd, function(err, stdout, stderr) { // There was some error assert.ok(err); From a0009898f29a664e9f7affd4e83e84ad334481f3 Mon Sep 17 00:00:00 2001 From: John Miller Date: Fri, 6 Oct 2017 12:06:43 -0700 Subject: [PATCH 3/3] Fixing alphabetical order --- test/parallel/test-error-reporting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-error-reporting.js b/test/parallel/test-error-reporting.js index 739990a7c24dfa..57b647df792c90 100644 --- a/test/parallel/test-error-reporting.js +++ b/test/parallel/test-error-reporting.js @@ -21,9 +21,9 @@ 'use strict'; const common = require('../common'); -const fixtures = require('../common/fixtures'); const assert = require('assert'); const exec = require('child_process').exec; +const fixtures = require('../common/fixtures'); function errExec(script, callback) { const cmd = `"${process.argv[0]}" "${fixtures.path(script)}"`;