Skip to content

test: fix test-tls-securepair-client #25222

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
wants to merge 2 commits into from
Closed

test: fix test-tls-securepair-client #25222

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e57cd6
test: fix test-tls-securepair-client
Trott Dec 26, 2018
2a879a3
test: move test-tls-securepair-client out of pummel
Trott Dec 26, 2018
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
25 changes: 14 additions & 11 deletions test/pummel/test-tls-securepair-client.js → .../sequential/test-tls-securepair-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ if (!common.opensslCli)
if (!common.hasCrypto)
common.skip('missing crypto');

if (common.isWindows)
common.skip('test does not work on Windows'); // ...but it should!

const net = require('net');
const assert = require('assert');
const fixtures = require('../common/fixtures');
Expand All @@ -54,14 +57,14 @@ function test2() {
test('keys/agent4-key.pem', 'keys/agent4-cert.pem', check);
}

function test(keyfn, certfn, check, next) {
const key = fixtures.readSync(keyfn).toString();
const cert = fixtures.readSync(certfn).toString();
function test(keyPath, certPath, check, next) {
const key = fixtures.readSync(keyPath).toString();
const cert = fixtures.readSync(certPath).toString();

const server = spawn(common.opensslCli, ['s_server',
'-accept', common.PORT,
'-cert', certfn,
'-key', keyfn]);
'-cert', fixtures.path(certPath),
'-key', fixtures.path(keyPath)]);
server.stdout.pipe(process.stdout);
server.stderr.pipe(process.stdout);

Expand All @@ -72,7 +75,7 @@ function test(keyfn, certfn, check, next) {
server.stdout.setEncoding('utf8');
server.stdout.on('data', function(s) {
serverStdoutBuffer += s;
console.error(state);
console.log(state);
switch (state) {
case 'WAIT-ACCEPT':
if (/ACCEPT/.test(serverStdoutBuffer)) {
Expand Down Expand Up @@ -132,6 +135,11 @@ function test(keyfn, certfn, check, next) {

s.on('connect', function() {
console.log('client connected');
setTimeout(function() {
pair.cleartext.write('hello\r\n', function() {
gotWriteCallback = true;
});
}, 500);
});

pair.on('secure', function() {
Expand All @@ -141,11 +149,6 @@ function test(keyfn, certfn, check, next) {
console.log('client pair.cleartext.getCipher(): %j',
pair.cleartext.getCipher());
if (check) check(pair);
setTimeout(function() {
pair.cleartext.write('hello\r\n', function() {
gotWriteCallback = true;
});
}, 500);
});

pair.cleartext.on('data', function(d) {
Expand Down