From d366676cc5e4f4301a3b42603532b142d0a981c1 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sun, 9 Dec 2018 09:44:44 -0800 Subject: [PATCH] test: split test-cli-syntax into multiple tests Split test-cli-syntax into multiple files to improve reliability and/or isolate unreliable test cases. Move test cases back to parallel as appropriate. PR-URL: https://github.com/nodejs/node/pull/24922 Reviewed-By: Bryan English Reviewed-By: Anatoli Papirovski --- test/parallel/test-cli-syntax-eval.js | 24 +++ test/parallel/test-cli-syntax-piped-bad.js | 35 ++++ test/parallel/test-cli-syntax-piped-good.js | 26 +++ test/sequential/sequential.status | 5 +- test/sequential/test-cli-syntax-bad.js | 47 +++++ .../test-cli-syntax-file-not-found.js | 39 ++++ test/sequential/test-cli-syntax-good.js | 43 +++++ test/sequential/test-cli-syntax-require.js | 35 ++++ test/sequential/test-cli-syntax.js | 171 ------------------ 9 files changed, 253 insertions(+), 172 deletions(-) create mode 100644 test/parallel/test-cli-syntax-eval.js create mode 100644 test/parallel/test-cli-syntax-piped-bad.js create mode 100644 test/parallel/test-cli-syntax-piped-good.js create mode 100644 test/sequential/test-cli-syntax-bad.js create mode 100644 test/sequential/test-cli-syntax-file-not-found.js create mode 100644 test/sequential/test-cli-syntax-good.js create mode 100644 test/sequential/test-cli-syntax-require.js delete mode 100644 test/sequential/test-cli-syntax.js diff --git a/test/parallel/test-cli-syntax-eval.js b/test/parallel/test-cli-syntax-eval.js new file mode 100644 index 00000000000000..cb4c4fd5688642 --- /dev/null +++ b/test/parallel/test-cli-syntax-eval.js @@ -0,0 +1,24 @@ +'use strict'; + +const common = require('../common'); +const assert = require('assert'); +const { exec } = require('child_process'); + +const node = process.execPath; + +// should throw if -c and -e flags are both passed +['-c', '--check'].forEach(function(checkFlag) { + ['-e', '--eval'].forEach(function(evalFlag) { + const args = [checkFlag, evalFlag, 'foo']; + const cmd = [node, ...args].join(' '); + exec(cmd, common.mustCall((err, stdout, stderr) => { + assert.strictEqual(err instanceof Error, true); + assert.strictEqual(err.code, 9); + assert( + stderr.startsWith( + `${node}: either --check or --eval can be used, not both` + ) + ); + })); + }); +}); diff --git a/test/parallel/test-cli-syntax-piped-bad.js b/test/parallel/test-cli-syntax-piped-bad.js new file mode 100644 index 00000000000000..64e2d47931eea1 --- /dev/null +++ b/test/parallel/test-cli-syntax-piped-bad.js @@ -0,0 +1,35 @@ +'use strict'; + +require('../common'); +const assert = require('assert'); +const { spawnSync } = require('child_process'); + +const node = process.execPath; + +// test both sets of arguments that check syntax +const syntaxArgs = [ + ['-c'], + ['--check'] +]; + +// Match on the name of the `Error` but not the message as it is different +// depending on the JavaScript engine. +const syntaxErrorRE = /^SyntaxError: \b/m; + +// Should throw if code piped from stdin with --check has bad syntax +// loop each possible option, `-c` or `--check` +syntaxArgs.forEach(function(args) { + const stdin = 'var foo bar;'; + const c = spawnSync(node, args, { encoding: 'utf8', input: stdin }); + + // stderr should include '[stdin]' as the filename + assert(c.stderr.startsWith('[stdin]'), `${c.stderr} starts with ${stdin}`); + + // no stdout or stderr should be produced + assert.strictEqual(c.stdout, ''); + + // stderr should have a syntax error message + assert(syntaxErrorRE.test(c.stderr), `${syntaxErrorRE} === ${c.stderr}`); + + assert.strictEqual(c.status, 1); +}); diff --git a/test/parallel/test-cli-syntax-piped-good.js b/test/parallel/test-cli-syntax-piped-good.js new file mode 100644 index 00000000000000..7e0cfbc89a491a --- /dev/null +++ b/test/parallel/test-cli-syntax-piped-good.js @@ -0,0 +1,26 @@ +'use strict'; + +require('../common'); +const assert = require('assert'); +const { spawnSync } = require('child_process'); + +const node = process.execPath; + +// test both sets of arguments that check syntax +const syntaxArgs = [ + ['-c'], + ['--check'] +]; + +// should not execute code piped from stdin with --check +// loop each possible option, `-c` or `--check` +syntaxArgs.forEach(function(args) { + const stdin = 'throw new Error("should not get run");'; + const c = spawnSync(node, args, { encoding: 'utf8', input: stdin }); + + // no stdout or stderr should be produced + assert.strictEqual(c.stdout, ''); + assert.strictEqual(c.stderr, ''); + + assert.strictEqual(c.status, 0); +}); diff --git a/test/sequential/sequential.status b/test/sequential/sequential.status index b8f52a209a7ebf..3b6cc916fb2611 100644 --- a/test/sequential/sequential.status +++ b/test/sequential/sequential.status @@ -8,7 +8,10 @@ prefix sequential # https://github.com/nodejs/node/issues/22336 test-gc-http-client: PASS,FLAKY # https://github.com/nodejs/node/issues/24403 -test-cli-syntax: PASS,FLAKY +test-cli-syntax-bad: PASS,FLAKY +test-cli-syntax-file-not-found: PASS,FLAKY +test-cli-syntax-good: PASS,FLAKY +test-cli-syntax-require: PASS,FLAKY [$system==win32] # https://github.com/nodejs/node/issues/22327 diff --git a/test/sequential/test-cli-syntax-bad.js b/test/sequential/test-cli-syntax-bad.js new file mode 100644 index 00000000000000..e1c7f3bec5870f --- /dev/null +++ b/test/sequential/test-cli-syntax-bad.js @@ -0,0 +1,47 @@ +'use strict'; + +const common = require('../common'); +const assert = require('assert'); +const { exec } = require('child_process'); +const fixtures = require('../common/fixtures'); + +const node = process.execPath; + +// test both sets of arguments that check syntax +const syntaxArgs = [ + ['-c'], + ['--check'] +]; + +// Match on the name of the `Error` but not the message as it is different +// depending on the JavaScript engine. +const syntaxErrorRE = /^SyntaxError: \b/m; + +// test bad syntax with and without shebang +[ + 'syntax/bad_syntax.js', + 'syntax/bad_syntax', + 'syntax/bad_syntax_shebang.js', + 'syntax/bad_syntax_shebang' +].forEach(function(file) { + file = fixtures.path(file); + + // loop each possible option, `-c` or `--check` + syntaxArgs.forEach(function(args) { + const _args = args.concat(file); + const cmd = [node, ..._args].join(' '); + exec(cmd, common.mustCall((err, stdout, stderr) => { + assert.strictEqual(err instanceof Error, true); + assert.strictEqual(err.code, 1); + + // no stdout should be produced + assert.strictEqual(stdout, ''); + + // stderr should have a syntax error message + assert(syntaxErrorRE.test(stderr), `${syntaxErrorRE} === ${stderr}`); + + // stderr should include the filename + assert(stderr.startsWith(file), `${stderr} starts with ${file}`); + })); + }); +}); diff --git a/test/sequential/test-cli-syntax-file-not-found.js b/test/sequential/test-cli-syntax-file-not-found.js new file mode 100644 index 00000000000000..848e2fe231ab31 --- /dev/null +++ b/test/sequential/test-cli-syntax-file-not-found.js @@ -0,0 +1,39 @@ +'use strict'; + +const common = require('../common'); +const assert = require('assert'); +const { exec } = require('child_process'); +const fixtures = require('../common/fixtures'); + +const node = process.execPath; + +// test both sets of arguments that check syntax +const syntaxArgs = [ + ['-c'], + ['--check'] +]; + +const notFoundRE = /^Error: Cannot find module/m; + +// test file not found +[ + 'syntax/file_not_found.js', + 'syntax/file_not_found' +].forEach(function(file) { + file = fixtures.path(file); + + // loop each possible option, `-c` or `--check` + syntaxArgs.forEach(function(args) { + const _args = args.concat(file); + const cmd = [node, ..._args].join(' '); + exec(cmd, common.mustCall((err, stdout, stderr) => { + // no stdout should be produced + assert.strictEqual(stdout, ''); + + // stderr should have a module not found error message + assert(notFoundRE.test(stderr), `${notFoundRE} === ${stderr}`); + + assert.strictEqual(err.code, 1); + })); + }); +}); diff --git a/test/sequential/test-cli-syntax-good.js b/test/sequential/test-cli-syntax-good.js new file mode 100644 index 00000000000000..1c2b3cbe55db80 --- /dev/null +++ b/test/sequential/test-cli-syntax-good.js @@ -0,0 +1,43 @@ +'use strict'; + +const common = require('../common'); +const assert = require('assert'); +const { exec } = require('child_process'); +const fixtures = require('../common/fixtures'); + +const node = process.execPath; + +// test both sets of arguments that check syntax +const syntaxArgs = [ + ['-c'], + ['--check'] +]; + +// test good syntax with and without shebang +[ + 'syntax/good_syntax.js', + 'syntax/good_syntax', + 'syntax/good_syntax_shebang.js', + 'syntax/good_syntax_shebang', + 'syntax/illegal_if_not_wrapped.js' +].forEach(function(file) { + file = fixtures.path(file); + + // loop each possible option, `-c` or `--check` + syntaxArgs.forEach(function(args) { + const _args = args.concat(file); + + const cmd = [node, ..._args].join(' '); + exec(cmd, common.mustCall((err, stdout, stderr) => { + if (err) { + console.log('-- stdout --'); + console.log(stdout); + console.log('-- stderr --'); + console.log(stderr); + } + assert.ifError(err); + assert.strictEqual(stdout, ''); + assert.strictEqual(stderr, ''); + })); + }); +}); diff --git a/test/sequential/test-cli-syntax-require.js b/test/sequential/test-cli-syntax-require.js new file mode 100644 index 00000000000000..ed13805eb9e653 --- /dev/null +++ b/test/sequential/test-cli-syntax-require.js @@ -0,0 +1,35 @@ +'use strict'; + +const common = require('../common'); +const assert = require('assert'); +const { exec } = require('child_process'); +const fixtures = require('../common/fixtures'); + +const node = process.execPath; + +// Match on the name of the `Error` but not the message as it is different +// depending on the JavaScript engine. +const syntaxErrorRE = /^SyntaxError: \b/m; + +// should work with -r flags +['-c', '--check'].forEach(function(checkFlag) { + ['-r', '--require'].forEach(function(requireFlag) { + const preloadFile = fixtures.path('no-wrapper.js'); + const file = fixtures.path('syntax', 'illegal_if_not_wrapped.js'); + const args = [requireFlag, preloadFile, checkFlag, file]; + const cmd = [node, ...args].join(' '); + exec(cmd, common.mustCall((err, stdout, stderr) => { + assert.strictEqual(err instanceof Error, true); + assert.strictEqual(err.code, 1); + + // no stdout should be produced + assert.strictEqual(stdout, ''); + + // stderr should have a syntax error message + assert(syntaxErrorRE.test(stderr), `${syntaxErrorRE} === ${stderr}`); + + // stderr should include the filename + assert(stderr.startsWith(file), `${stderr} starts with ${file}`); + })); + }); +}); diff --git a/test/sequential/test-cli-syntax.js b/test/sequential/test-cli-syntax.js deleted file mode 100644 index 74e8c9fa91755f..00000000000000 --- a/test/sequential/test-cli-syntax.js +++ /dev/null @@ -1,171 +0,0 @@ -'use strict'; - -const common = require('../common'); -const assert = require('assert'); -const { exec, spawnSync } = require('child_process'); -const fixtures = require('../common/fixtures'); - -const node = process.execPath; - -// test both sets of arguments that check syntax -const syntaxArgs = [ - ['-c'], - ['--check'] -]; - -// Match on the name of the `Error` but not the message as it is different -// depending on the JavaScript engine. -const syntaxErrorRE = /^SyntaxError: \b/m; -const notFoundRE = /^Error: Cannot find module/m; - -// test good syntax with and without shebang -[ - 'syntax/good_syntax.js', - 'syntax/good_syntax', - 'syntax/good_syntax_shebang.js', - 'syntax/good_syntax_shebang', - 'syntax/illegal_if_not_wrapped.js' -].forEach(function(file) { - file = fixtures.path(file); - - // loop each possible option, `-c` or `--check` - syntaxArgs.forEach(function(args) { - const _args = args.concat(file); - - const cmd = [node, ..._args].join(' '); - exec(cmd, common.mustCall((err, stdout, stderr) => { - if (err) { - console.log('-- stdout --'); - console.log(stdout); - console.log('-- stderr --'); - console.log(stderr); - } - assert.ifError(err); - assert.strictEqual(stdout, ''); - assert.strictEqual(stderr, ''); - })); - }); -}); - -// test bad syntax with and without shebang -[ - 'syntax/bad_syntax.js', - 'syntax/bad_syntax', - 'syntax/bad_syntax_shebang.js', - 'syntax/bad_syntax_shebang' -].forEach(function(file) { - file = fixtures.path(file); - - // loop each possible option, `-c` or `--check` - syntaxArgs.forEach(function(args) { - const _args = args.concat(file); - const cmd = [node, ..._args].join(' '); - exec(cmd, common.mustCall((err, stdout, stderr) => { - assert.strictEqual(err instanceof Error, true); - assert.strictEqual(err.code, 1); - - // no stdout should be produced - assert.strictEqual(stdout, ''); - - // stderr should have a syntax error message - assert(syntaxErrorRE.test(stderr), `${syntaxErrorRE} === ${stderr}`); - - // stderr should include the filename - assert(stderr.startsWith(file), `${stderr} starts with ${file}`); - })); - }); -}); - -// test file not found -[ - 'syntax/file_not_found.js', - 'syntax/file_not_found' -].forEach(function(file) { - file = fixtures.path(file); - - // loop each possible option, `-c` or `--check` - syntaxArgs.forEach(function(args) { - const _args = args.concat(file); - const cmd = [node, ..._args].join(' '); - exec(cmd, common.mustCall((err, stdout, stderr) => { - // no stdout should be produced - assert.strictEqual(stdout, ''); - - // stderr should have a module not found error message - assert(notFoundRE.test(stderr), `${notFoundRE} === ${stderr}`); - - assert.strictEqual(err.code, 1); - })); - }); -}); - -// should not execute code piped from stdin with --check -// loop each possible option, `-c` or `--check` -syntaxArgs.forEach(function(args) { - const stdin = 'throw new Error("should not get run");'; - const c = spawnSync(node, args, { encoding: 'utf8', input: stdin }); - - // no stdout or stderr should be produced - assert.strictEqual(c.stdout, ''); - assert.strictEqual(c.stderr, ''); - - assert.strictEqual(c.status, 0); -}); - -// Should throw if code piped from stdin with --check has bad syntax -// loop each possible option, `-c` or `--check` -syntaxArgs.forEach(function(args) { - const stdin = 'var foo bar;'; - const c = spawnSync(node, args, { encoding: 'utf8', input: stdin }); - - // stderr should include '[stdin]' as the filename - assert(c.stderr.startsWith('[stdin]'), `${c.stderr} starts with ${stdin}`); - - // no stdout or stderr should be produced - assert.strictEqual(c.stdout, ''); - - // stderr should have a syntax error message - assert(syntaxErrorRE.test(c.stderr), `${syntaxErrorRE} === ${c.stderr}`); - - assert.strictEqual(c.status, 1); -}); - -// should throw if -c and -e flags are both passed -['-c', '--check'].forEach(function(checkFlag) { - ['-e', '--eval'].forEach(function(evalFlag) { - const args = [checkFlag, evalFlag, 'foo']; - const cmd = [node, ...args].join(' '); - exec(cmd, common.mustCall((err, stdout, stderr) => { - assert.strictEqual(err instanceof Error, true); - assert.strictEqual(err.code, 9); - assert( - stderr.startsWith( - `${node}: either --check or --eval can be used, not both` - ) - ); - })); - }); -}); - -// should work with -r flags -['-c', '--check'].forEach(function(checkFlag) { - ['-r', '--require'].forEach(function(requireFlag) { - const preloadFile = fixtures.path('no-wrapper.js'); - const file = fixtures.path('syntax', 'illegal_if_not_wrapped.js'); - const args = [requireFlag, preloadFile, checkFlag, file]; - const cmd = [node, ...args].join(' '); - exec(cmd, common.mustCall((err, stdout, stderr) => { - assert.strictEqual(err instanceof Error, true); - assert.strictEqual(err.code, 1); - - // no stdout should be produced - assert.strictEqual(stdout, ''); - - // stderr should have a syntax error message - assert(syntaxErrorRE.test(stderr), `${syntaxErrorRE} === ${stderr}`); - - // stderr should include the filename - assert(stderr.startsWith(file), `${stderr} starts with ${file}`); - })); - }); -});