Skip to content

test: do not assume tls handshake order #25508

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.

Sign up for GitHub

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

Closed
sam-github wants to merge 11 commits into from
Closed

test: do not assume tls handshake order #25508

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
74f1db9
test: wait for TCP connect, not TLS handshake
sam-github Feb 1, 2019
6c13102
test: do not assume server gets secure connection
sam-github Feb 1, 2019
78565d7
test: do not assume tls handshake order
sam-github Jan 8, 2019
c523483
test: do not race connection and rejection
sam-github Jan 9, 2019
e981f20
test: pin regression test for #8074 to TLS 1.2
sam-github Jan 15, 2019
39327b2
test: end tls gracefully, rather than destroy
sam-github Feb 1, 2019
79412a4
test: send a bad record only after connection done
sam-github Feb 1, 2019
431fd20
test: use mustCall in ephemeralkeyinfo test
sam-github Feb 1, 2019
55e0809
test: use common.mustCall(), and log the events
sam-github Feb 1, 2019
3dab493
test: use mustCall(), not global state checks
sam-github Feb 1, 2019
619b034
test: clarify confusion over "client" in comment
sam-github Feb 1, 2019
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: use mustCall(), not global state checks 
Instead of pushing state into global arrays and checking the results
before exit, use common.mustCall() and make the checks immediately.
  • Loading branch information
@sam-github
sam-github committed Feb 5, 2019
commit 3dab493098c562d8e9d1c6917b35c86681827029
17 changes: 4 additions & 13 deletions test/parallel/test-tls-socket-constructor-alpn-options-parsing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ const fixtures = require('../common/fixtures');
const key = fixtures.readKey('agent1-key.pem');
const cert = fixtures.readKey('agent1-cert.pem');

const protocols = [];

const server = net.createServer(common.mustCall((s) => {
const tlsSocket = new tls.TLSSocket(s, {
isServer: true,
Expand All @@ -32,10 +30,9 @@ const server = net.createServer(common.mustCall((s) => {
});

tlsSocket.on('secure', common.mustCall(() => {
protocols.push({
alpnProtocol: tlsSocket.alpnProtocol,
});
assert.strictEqual(tlsSocket.alpnProtocol, 'http/1.1');
tlsSocket.end();
server.close();
}));
}));

Expand All @@ -46,13 +43,7 @@ server.listen(0, common.mustCall(() => {
ALPNProtocols: ['h2', 'http/1.1']
};

tls.connect(alpnOpts, function() {
tls.connect(alpnOpts, common.mustCall(function() {
this.end();

server.close();

assert.deepStrictEqual(protocols, [
{ alpnProtocol: 'http/1.1' },
]);
});
}));
}));