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

deps: upgrade to npm 2.14.18 #5245

Closed
wants to merge 71 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
9e36ea3
src: don't check failure with ERR_peek_error()
bnoordhuis Jan 17, 2016
86eee8e
debugger: guard against call from non-node context
bnoordhuis Dec 17, 2015
afd9b66
tools: add license-builder.sh to construct LICENSE
rvagg Dec 3, 2015
6912381
doc: rebuild LICENSE using tools/license-builder.sh
rvagg Dec 8, 2015
fda6fde
tools: fix license-builder.sh for ICU
richardlau Jan 19, 2016
28c946e
doc: restore ICU third-party software licenses
richardlau Jan 19, 2016
0a1a1ee
gitignore: never ignore debug module
targos Nov 5, 2015
082343d
tools: update eslint to v1.10.3
targos Jan 12, 2016
0f24a09
tools: update eslint config
targos Nov 5, 2015
155c268
lib: fix style issues after eslint update
targos Jan 12, 2016
f692c74
tools: fix style issue after eslint update
targos Jan 13, 2016
28e21b0
test: fix style issues after eslint update
targos Jan 13, 2016
c841d57
tls: copy client CAs and cert store on CertCb
indutny Oct 26, 2015
6499012
module: move unnecessary work for early return
zertosh Oct 29, 2015
ab95f93
test: fix tls-multi-key race condition
santigimeno Nov 22, 2015
bb8407e
doc: add docs working group
bengl Dec 11, 2015
392ca76
cluster: fix race condition setting suicide prop
santigimeno Dec 18, 2015
707858b
doc: add path property to Write/ReadStream in fs.markdown
claudiorodriguez Dec 20, 2015
263b9e2
test: test each block in addon.md contains js & cc
rvagg Dec 24, 2015
8cda74d
test: use addon.md block headings as test dir names
rvagg Dec 24, 2015
5a7364b
doc: fix formatting in process.markdown
Trott Dec 27, 2015
d16830e
doc: copyedit setTimeout() documentation
Trott Dec 27, 2015
849fda9
test: fix flaky child-process-fork-regr-gh-2847
mscdex Dec 27, 2015
5f6b7c1
test: fix flaky cluster-net-send
mscdex Dec 28, 2015
ac1e89b
doc: mention that http.Server inherits from net.Server
ryansobol Dec 28, 2015
39ef824
http: fix non-string header value concatenation
mscdex Dec 28, 2015
205418a
cluster: ignore queryServer msgs on disconnection
santigimeno Dec 29, 2015
eeac12e
test: fix flaky test-cluster-shared-leak
Trott Jan 1, 2016
6ef981e
test: fix `http-upgrade-agent` flakiness
santigimeno Jan 3, 2016
2f481e1
repl: make sure historyPath is trimmed
evanlucas Jan 5, 2016
96f5ff4
net: fix dns lookup for android
daguej Jan 8, 2016
00c964a
net, doc: fix line wrapping lint in net.js
jasnell Jan 8, 2016
94fbf92
test: fix flaky unrefed timers test
Trott Jan 9, 2016
a1eb12c
test: fix `http-upgrade-client` flakiness
santigimeno Jan 9, 2016
fe047d6
src: remove redeclarations of variables
Trott Jan 10, 2016
8473fab
test: only include http module once
Trott Jan 10, 2016
9921175
test: require common module only once
Trott Jan 10, 2016
237e80c
http: remove variable redeclaration
Trott Jan 10, 2016
cc1fcf4
dgram: prevent disabled optimization of bind()
mscdex Jan 10, 2016
375122e
test: move resource intensive tests to sequential
Trott Jan 11, 2016
5bc404d
test: remove 1 second delay from test
Trott Jan 11, 2016
86aa044
stream: remove useless if test in transform
zoubin Jan 11, 2016
bf0c489
tls_legacy: do not read on OpenSSL's stack
indutny Jan 6, 2016
587afee
debugger: remove variable redeclarations
Trott Jan 11, 2016
6508a0c
test: fix race in test-net-server-pause-on-connect
Trott Jan 12, 2016
44bdee4
doc: add docs for more stream options
zoubin Jan 12, 2016
9a02fb3
net: remove hot path comment from connect
evanlucas Jan 12, 2016
5f9345a
test: fix flaky test-net-socket-local-address
cjihrig Jan 12, 2016
4b57a46
querystring: improve parse() performance
mscdex Jan 13, 2016
5d2f581
crypto: clear error stack in ECDH::Initialize
indutny Jan 14, 2016
617faf7
readline: Remove XXX and output debuglog
kohei-takata Jan 15, 2016
2eecde6
doc: update branch-diff arguments in release doc
rvagg Jan 14, 2016
1fdae32
buffer: remove unnecessary TODO comments
pgeiss Jan 16, 2016
1282663
doc: add `servername` parameter docs
estliberitas Jan 17, 2016
6bb4fb9
test: make test-cluster-disconnect-leak reliable
Trott Jan 18, 2016
fa62321
buffer: make byteLength work with Buffer correctly
JacksonTian Jan 18, 2016
c2196ac
test: improve test-cluster-disconnect-suicide-race
Trott Jan 18, 2016
5952de8
doc: style fixes for the TOC
silverwind Jan 18, 2016
94d4765
test: fix issues for space-in-parens ESLint rule
silverwind Jan 19, 2016
2046400
tools: enable space-in-parens ESLint rule
silverwind Jan 19, 2016
5494322
doc: update list of personal traits in CoC
zkat Jan 21, 2016
85aa6e4
tools: add support for subkeys in release tools
MylesBorins Jan 21, 2016
70fd5b7
deps: upgrade to npm 2.14.15
zkat Jan 26, 2016
2e052ee
test: make npm tests work on prerelease node versions
zkat Jan 26, 2016
be7cbdb
doc: Update small error in LICENSE for npm
zkat Jan 27, 2016
3e76cb7
deps: upgrade to npm 2.14.16
zkat Jan 29, 2016
967ebf5
test: make npm tests work on prerelease node versions
zkat Jan 26, 2016
1ea40ac
test: fix tls-no-rsa-key flakiness
santigimeno Nov 26, 2015
c478fe2
deps: upgrade to npm 2.14.17
zkat Feb 5, 2016
8b08780
node_contextify: do not incept debug context
Feb 1, 2016
ab1da5d
deps: upgrade to npm 2.14.18
zkat Feb 15, 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: fix flaky test-net-socket-local-address
Prior to this commit, the test was flaky because it was
executing the majority of its logic in a function called from
the client and multiple events on the server. This commit
simplifies the test by separating the server's connection and
listening events, and isolating the client logic.

Refs: #4476
Refs: #4644
PR-URL: #4650
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
cjihrig authored and Myles Borins committed Feb 11, 2016
commit 5f9345ab5e78ae172a75cf110e74a78e8bf365e1
32 changes: 13 additions & 19 deletions test/parallel/test-net-socket-local-address.js
Original file line number Diff line number Diff line change
@@ -12,35 +12,29 @@ if (common.inFreeBSDJail) {
var conns = 0;
var clientLocalPorts = [];
var serverRemotePorts = [];

const server = net.createServer(function(socket) {
const client = new net.Socket();
const server = net.createServer(socket => {
serverRemotePorts.push(socket.remotePort);
testConnect();
socket.end();
});

const client = new net.Socket();

server.on('close', common.mustCall(function() {
server.on('close', common.mustCall(() => {
assert.deepEqual(clientLocalPorts, serverRemotePorts,
'client and server should agree on the ports used');
assert.equal(2, conns);
assert.strictEqual(2, conns);
}));

server.listen(common.PORT, common.localhostIPv4, testConnect);
server.listen(common.PORT, common.localhostIPv4, connect);

function testConnect() {
if (conns > serverRemotePorts.length || conns > clientLocalPorts.length) {
// We're waiting for a callback to fire.
function connect() {
if (conns === 2) {
server.close();
return;
}

if (conns === 2) {
return server.close();
}
client.connect(common.PORT, common.localhostIPv4, function() {
clientLocalPorts.push(this.localPort);
this.once('close', testConnect);
this.destroy();
});
conns++;
client.once('close', connect);
client.connect(common.PORT, common.localhostIPv4, () => {
clientLocalPorts.push(client.localPort);
});
}