Skip to content

test,win: speedup tls-server-verify #1836

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

test,win: speedup tls-server-verify #1836

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
830d454
test: running tls-server-verify clients in parallel
joaocgreis May 22, 2015
1bcb5f0
test: run tls-server-verify servers in parallel
joaocgreis May 22, 2015
f49019f
test: improve console output of tls-server-verify
joaocgreis May 22, 2015
0368003
test: kill child in tls-server-verify for speed up
May 27, 2015
2107be0
deps: add -no_rand_screen to openssl s_client
May 27, 2015
e809f01
test: add -no_rand_screen for tls-server-verify
May 27, 2015
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: run tls-server-verify servers in parallel 
Different servers must use different ports. Since we can count only on
common.PORT and common.PORT+1, run only 2 servers in parallel.

(cherry picked from commit efb0075ee0e1f4123974fe5b74ded8727bad4a9e)
  • Loading branch information
@joaocgreis
joaocgreis committed Jun 1, 2015
commit 1bcb5f0302204b42d6a3df54bf64ceb56056ff33
22 changes: 12 additions & 10 deletions test/parallel/test-tls-server-verify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,14 @@ var serverKey = loadPEM('agent2-key');
var serverCert = loadPEM('agent2-cert');


function runClient(options, cb) {
function runClient(port, options, cb) {

// Client can connect in three ways:
// - Self-signed cert
// - Certificate, but not signed by CA.
// - Certificate signed by CA.

var args = ['s_client', '-connect', '127.0.0.1:' + common.PORT];
var args = ['s_client', '-connect', '127.0.0.1:' + port];


console.log(' connecting with', options.name);
Expand Down Expand Up @@ -230,7 +230,7 @@ function runClient(options, cb) {

// Run the tests
var successfulTests = 0;
function runTest(testIndex) {
function runTest(port, testIndex) {
var tcase = testCases[testIndex];
if (!tcase) return;

Expand Down Expand Up @@ -293,31 +293,31 @@ function runTest(testIndex) {
function runNextClient(clientIndex) {
var options = tcase.clients[clientIndex];
if (options) {
runClient(options, function() {
runClient(port, options, function() {
runNextClient(clientIndex + 1);
});
} else {
server.close();
successfulTests++;
runTest(testIndex + 1);
runTest(port, nextTest++);
}
}

server.listen(common.PORT, function() {
server.listen(port, function() {
if (tcase.debug) {
console.error('TLS server running on port ' + common.PORT);
console.error('TLS server running on port ' + port);
} else {
if (tcase.renegotiate) {
runNextClient(0);
} else {
var clientsCompleted = 0;
for (var i = 0; i < tcase.clients.length; i++) {
runClient(tcase.clients[i], function() {
runClient(port, tcase.clients[i], function() {
clientsCompleted++;
if (clientsCompleted === tcase.clients.length) {
server.close();
successfulTests++;
runTest(testIndex + 1);
runTest(port, nextTest++);
}
});
}
Expand All @@ -327,7 +327,9 @@ function runTest(testIndex) {
}


runTest(0);
var nextTest = 0;
runTest(common.PORT, nextTest++);
runTest(common.PORT + 1, nextTest++);


process.on('exit', function() {
Expand Down