Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v6.9.2 proposal #9735

Merged
merged 145 commits into from
Dec 6, 2016
Merged
Changes from 1 commit
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
0fcf249
deps: cherry-pick bb4974d from v8 upstream
Oct 19, 2016
8b85d47
tools: use long format for gpg fingerprint
MylesBorins Oct 24, 2016
7dc875c
v8: update make-v8.sh to use git
Nov 1, 2016
a643d3c
test: output tap13 instead of almost-tap
jbergstroem Oct 12, 2016
575fc4e
gtest: output tap comments as yamlish
jbergstroem Oct 25, 2016
4141c77
gitignore: ignore all tap files
jbergstroem Oct 25, 2016
e2bb2a2
tools: fix release script on macOS 10.12
evanlucas Sep 28, 2016
638ef09
doc: fix typo in http.md
anu0012 Oct 18, 2016
ec90f73
doc: reference signal(7) for the list of signals
emadb Oct 27, 2016
2ea5db9
doc: do not link in the headings
thefourtheye Nov 2, 2016
d312899
doc: revise http documentation
TimothyGu Sep 10, 2016
0e37a6a
src: fix typo rval to value
maasencioh Oct 11, 2016
70eadea
doc: fix broken links in changelogs
evanlucas Aug 16, 2016
cc6b2f4
test: fixes that do not affect performance
larissayvette Oct 10, 2016
847b15c
governance: expand use of CTC issue tracker
Trott Oct 6, 2016
9cc9001
test: refactor test-file-*
Oct 10, 2016
9cfa91b
crypto: use SSL_get_SSL_CTX.
agl Oct 9, 2016
c0f8198
doc: fix typo
seishun Oct 13, 2016
ae3f31b
test: fix issues reported by Coverity
Sep 30, 2016
3af679e
doc: explain why GitHub merge button is not used
jalafel Oct 12, 2016
0a2a39c
doc: explains why Reviewed-By is added in PRs
jalafel Oct 12, 2016
97748c6
test: move module out of fixture directory
Trott Oct 11, 2016
0d21f95
doc: highlight deprecated API in ToC
ilfroloff Sep 2, 2016
9de8cfe
build: fix config.gypi target
danbev Oct 12, 2016
cbfde3c
child_process: update outdated comment
tanujasawant Oct 9, 2016
0f1a22d
net: fix ambiguity in EOF handling
indutny Oct 12, 2016
87285ed
tools: avoid let in for loops
jalafel Oct 12, 2016
b2a2a57
doc: specify that errno is a number, not a string
Oct 10, 2016
def6874
test: use npm sandbox in test-npm-install
joaocgreis Oct 13, 2016
4d4d02a
crypto: fix faulty logic in iv size check
bnoordhuis Oct 11, 2016
de2f050
doc: update reference to list hash algorithms in crypto.md
sstern6 Oct 11, 2016
2c5b27a
doc: improved example for http.get
marzelin Oct 12, 2016
e5777b3
doc: edit Stream api grammar
bcmarinacci Oct 14, 2016
fd006e5
doc: further improve child_process doc types
Ingramz Oct 14, 2016
bdd91e0
doc: fix typo in zlib.md
parambirs Oct 17, 2016
127ed73
test: remove unused common.libDir
Trott Oct 17, 2016
39a53a0
test: remove unneeded escaping in template strings
Trott Oct 15, 2016
e9d5cd7
tools: update ESLint to v3.8.0
Trott Oct 15, 2016
6c9a84b
doc: add ctc-review label information
Trott Oct 13, 2016
e680ad5
doc: fix header level for crypto.constants
evanlucas Oct 19, 2016
a038115
doc: suggest nodejs/help for general support
Oct 17, 2016
cfcf948
doc: v6 is now LTS rather than Current
Fishrock123 Oct 19, 2016
3ee94f2
doc: remove confusing reference in governance doc
Trott Oct 13, 2016
79e998a
doc: add CTC meeting minutes for 2016-10-12
mhdawson Oct 13, 2016
2230c26
deps: upgrade npm to 3.10.9
zkat Oct 26, 2016
39b4a1c
deps: revert default gtest reporter change
mscdex Oct 17, 2016
bda45b5
deps: backport 5c8cb16 from upstream V8
cristiancavalli Nov 2, 2016
6f78089
test: fix flaky test-child-process-fork-dgram
Trott Oct 14, 2016
02f7e3a
test: checking if error constructor is assert.AssertionError
larissayvette Oct 12, 2016
88cd4cf
test: rename target to exports for consistency
danbev Oct 17, 2016
7b75cb9
test,lib,benchmark: match function names
Trott Oct 15, 2016
5c42d98
test: remove duplicate required module
Trott Oct 18, 2016
9077f63
tools: replace custom lint rule for getter/setter
Trott Oct 19, 2016
53de0c2
doc: improve header styling for API docs
Fishrock123 Sep 27, 2016
ce2d434
test: remove arbitrary timer
Trott Oct 19, 2016
ae73ecb
doc: add 2016-10-19 CTC meeting minutes
joshgav Oct 19, 2016
2a9fc7c
doc: add 2016-09-28 CTC meeting minutes
joshgav Oct 27, 2016
925a51b
doc: add 2016-10-05 CTC meeting minutes
joshgav Oct 27, 2016
4c4b0f7
doc: add 2016-10-26 CTC meeting minutes
Trott Oct 28, 2016
1b79274
doc: add Sakthipriyan to the CTC
rvagg Nov 2, 2016
4f25236
doc: fix link to cli.md in vm.md
danbev Nov 5, 2016
a8840bb
deps: cherry-pick 3c39bac from V8 upstream
Oct 17, 2016
804b398
deps: revert botched V8 backport
Nov 15, 2016
96e8e86
deps: cherry-pick 6f68f30 from v8 upstream
stefanmb Jul 20, 2016
60704fb
test: fix flaky test-timers-blocking-callback
Trott Oct 20, 2016
a120199
tools: enable ES2016 syntax support in ESLint
targos Oct 21, 2016
ee01594
doc: fixes formatting in process
Oct 22, 2016
a46c027
test: move flaky test to test/pummel
bnoordhuis Oct 22, 2016
18a235b
test: make flaky pummel test more reliable
bnoordhuis Oct 22, 2016
1d79af6
test: case sensitivity of env variables
oliversalzburg Oct 18, 2016
6f212b9
doc: mention case-insensitive env on windows
oliversalzburg Oct 18, 2016
a5860b4
doc: clarify relation between a file and a module
marzelin Oct 11, 2016
ae3ce7f
doc: clarify buffer toString docs.
Oct 8, 2016
adee939
doc: more realistic custom inspect example
Havvy Oct 1, 2016
07d34f9
tools: remove dangling eslint symlink
sam-github Oct 26, 2016
210ae56
test: prevent workers outliving parent
sam-github Oct 24, 2016
f64d93f
test: writable stream finished state
italoacasas Sep 27, 2016
7fbfb73
test: writable stream ending state
italoacasas Sep 22, 2016
b3f8f89
inspector: no URLs when the debugger is connected
Oct 3, 2016
1fee6c1
test: writable stream needDrain state
italoacasas Sep 27, 2016
eeaadcd
doc: add italoacasas to collaborators
Nov 18, 2016
d2b0cae
doc: update CONTRIBUTING.md to address editing PRs
gibfahn Oct 19, 2016
f0a8bcc
deps: back port OpenBSD fix in c-ares/c-ares
qbit Oct 23, 2016
b5bcd25
inspector: fix request path nullptr dereference
bnoordhuis Oct 19, 2016
ef1cf6b
test: remove test-v8-inspector-json-protocol test
bnoordhuis Oct 19, 2016
5efb3c3
lib: fix beforeExit not working with -e
bnoordhuis Sep 28, 2016
ad4cc36
test: add coverage for execFileSync() errors
cjihrig Oct 20, 2016
653f092
doc: simplify process.memoryUsage() example code
watson Nov 12, 2016
0276e9e
buffer: coerce slice parameters consistently
thefourtheye Oct 14, 2016
0cffa3c
buffer: coerce offset using Math.trunc()
cjihrig Oct 28, 2016
b867294
child_process: remove unreachable execSync() code
cjihrig Oct 20, 2016
e108f20
buffer: use correct name for custom inspect symbol
charmander Oct 26, 2016
0fdfba8
test: fix flaky test by removing timer
evanlucas Oct 20, 2016
b83b517
test: add child_process.exec() timeout coverage
cjihrig Oct 20, 2016
89eb175
src: remove unused function
mscdex Oct 23, 2016
8d985c2
test: clean up `test-child-process-exec-cwd.js`
jeenalee Oct 21, 2016
9cb236f
tls: fix leak of WriteWrap+TLSWrap combination
indutny Nov 12, 2016
627c0cb
doc: child_process .stdio accepts a String type
skovhus Nov 16, 2016
0c32b03
test: remove err timer from test-http-set-timeout
BethGriggs Oct 24, 2016
88e60c2
test: use strict assertions in module loader test
bnoordhuis Oct 24, 2016
2388648
tools: make --repeat work with -j in test.py
Trott Oct 24, 2016
1d54f07
test: refactor /parallel/test-cluster-uncaught-exception.js to ES6
deverickapollo Oct 21, 2016
52a04bb
util: use template strings
a0viedo Oct 17, 2016
ed3de08
repl: make `key` of `repl.write()` optional always
addaleax Oct 20, 2016
58b60fc
repl: don’t write to input stream in editor mode
addaleax Oct 20, 2016
5eeac8c
benchmark: add microbenchmarks for ES Map
rvagg Jul 7, 2016
4fcc2c1
test: run all of test-timers-blocking-callback
Trott Oct 26, 2016
c857586
build: use wxneeded on openbsd
qbit Oct 21, 2016
4ef7f00
test: refactor test-async-wrap-check-providers
Oct 26, 2016
8b2b08a
test: fix flaky test-fs-watch-recursive on OS X
Trott Oct 26, 2016
ce05b70
test: fix freebsd10-64 CI failures
Trott Oct 27, 2016
bec1cca
test: clean up dgram-broadcast-multi-process test
iredelmeier Oct 27, 2016
7c90d96
doc: update OpenSSL links
kobelb Oct 28, 2016
c379c29
doc: fs: fix link to mkdtemp
coderaiser Oct 31, 2016
c31fa24
doc: fix broken links to Buffer.from(string)
jmm Oct 26, 2016
5e1fd28
test: refactor test-http-client-readable
Trott Oct 28, 2016
a178abf
lib: change == to === in linkedlist
jedireza Oct 29, 2016
5d971af
doc: fix outdate ninja link
lovexi Oct 25, 2016
6908bc4
doc: add more internal links to fs.Stats object
zeke Oct 28, 2016
7b60288
doc: use 'an' over 'a', remove redundant sentence
zeke Oct 28, 2016
2c056a4
test: remove timer in test-dgram-send-empty-array
Trott Oct 29, 2016
54def06
test: add test for HTTP client "aborted" event
kemitchell Jun 22, 2016
5c2ed2e
build: make node-gyp output silent
thefourtheye Oct 9, 2016
1726dc7
doc: update Diagnostics WG info
joshgav Oct 27, 2016
259b942
test: move timer-dependent test to sequential
Trott Nov 3, 2016
d36c6f5
doc: update GOVERNANCE.md to use "meeting chair"
Trott Nov 3, 2016
6fc0f1b
doc: note that tests should include a description
gibfahn Nov 5, 2016
b91d5e1
test: update http-header-obstext
gibfahn Nov 5, 2016
d926f16
doc: update minute-taking procedure for CTC
Trott Nov 2, 2016
aaf7834
test: fix flaky test-force-repl-with-eval
santigimeno Nov 4, 2016
093d677
test: fix flaky test-net-GH-5504
santigimeno Nov 4, 2016
1ed58ed
build: reduce noise from doc target
danbev Nov 4, 2016
4ccdbb2
test: improve test-debugger-util-regression
santigimeno Nov 6, 2016
c1aee02
build: start comments at beginning of line
thefourtheye Oct 31, 2016
0216dbe
test: remove timers from streams test
addaleax Oct 29, 2016
cf5a00e
inspector: do not prompt to use localhost
Nov 3, 2016
8a91616
src: replace SetNamedPropertyHandler()
AnnaMag Oct 6, 2016
bd7c1e7
tools: allow test.py to use full paths of tests
reconbot Nov 19, 2016
0d15ec8
deps: cherry pick 7166503 from upstream v8
cristiancavalli Oct 18, 2016
24fc1e2
test: cleanup test-dgram-error-message-address
Goyapa Oct 5, 2016
59d8255
test: remove watchdog in test-debug-signal-cluster
Trott Nov 5, 2016
9ed60d3
async_wrap: mode constructor/destructor to .cc
trevnorris Nov 23, 2016
3e5b2eb
async_wrap: make Initialize a static class member
trevnorris Nov 23, 2016
f3b0cf5
async_wrap: call destroy() callback in uv_idle_t
trevnorris Nov 23, 2016
94a3aef
2016-12-06, Version 6.9.2 'Boron' (LTS) Release
Nov 22, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test: add child_process.exec() timeout coverage
This commit adds coverage for the timeout option used by
child_process exec() and execFile().

PR-URL: #9208
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
  • Loading branch information
cjihrig authored and Myles Borins committed Nov 22, 2016
commit b83b5176d4ad16102efadad1382117fa4b98510c
47 changes: 47 additions & 0 deletions test/parallel/test-child-process-exec-timeout.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const cp = require('child_process');

if (process.argv[2] === 'child') {
setTimeout(() => {
// The following console statements are part of the test.
console.log('child stdout');
console.error('child stderr');
}, common.platformTimeout(1000));
return;
}

const cmd = `${process.execPath} ${__filename} child`;

// Test the case where a timeout is set, and it expires.
cp.exec(cmd, { timeout: 1 }, common.mustCall((err, stdout, stderr) => {
assert.strictEqual(err.killed, true);
assert.strictEqual(err.code, null);
assert.strictEqual(err.signal, 'SIGTERM');
assert.strictEqual(err.cmd, cmd);
assert.strictEqual(stdout.trim(), '');
assert.strictEqual(stderr.trim(), '');
}));

// Test with a different kill signal.
cp.exec(cmd, {
timeout: 1,
killSignal: 'SIGKILL'
}, common.mustCall((err, stdout, stderr) => {
assert.strictEqual(err.killed, true);
assert.strictEqual(err.code, null);
assert.strictEqual(err.signal, 'SIGKILL');
assert.strictEqual(err.cmd, cmd);
assert.strictEqual(stdout.trim(), '');
assert.strictEqual(stderr.trim(), '');
}));

// Test the case where a timeout is set, but not expired.
cp.exec(cmd, { timeout: Math.pow(2, 30) },
common.mustCall((err, stdout, stderr) => {
assert.ifError(err);
assert.strictEqual(stdout.trim(), 'child stdout');
assert.strictEqual(stderr.trim(), 'child stderr');
})
);