From 5011dfe4221a3c4f1f421e62a41259f5249b4479 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 8 Dec 2018 06:48:11 -0800 Subject: test: move test-cli-syntax to sequential MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is unreliable under load and the CI failures are getting a bit out of hand. Let's move it to sequential. Refs: https://github.com/nodejs/node/issues/24403 PR-URL: https://github.com/nodejs/node/pull/24907 Reviewed-By: Michaël Zasso Reviewed-By: Joyee Cheung Reviewed-By: Colin Ihrig --- test/parallel/test-cli-syntax.js | 171 ------------------------------------- test/sequential/test-cli-syntax.js | 171 +++++++++++++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 171 deletions(-) delete mode 100644 test/parallel/test-cli-syntax.js create mode 100644 test/sequential/test-cli-syntax.js (limited to 'test') diff --git a/test/parallel/test-cli-syntax.js b/test/parallel/test-cli-syntax.js deleted file mode 100644 index 35cc78258d..0000000000 --- a/test/parallel/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}`); - })); - }); -}); diff --git a/test/sequential/test-cli-syntax.js b/test/sequential/test-cli-syntax.js new file mode 100644 index 0000000000..35cc78258d --- /dev/null +++ b/test/sequential/test-cli-syntax.js @@ -0,0 +1,171 @@ +'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}`); + })); + }); +}); -- cgit v1.2.3