From 39484f49ef60e2ebf05ad70838d9572e56558347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Ma=C5=82ecki?= Date: Tue, 1 Nov 2011 16:28:04 +0100 Subject: [PATCH] test tls: make tests use new `tls.connect` API Refs #1983. --- test/simple/test-tls-client-abort.js | 2 +- test/simple/test-tls-client-resume.js | 4 ++-- test/simple/test-tls-client-verify.js | 3 ++- test/simple/test-tls-connect-simple.js | 4 ++-- test/simple/test-tls-connect.js | 2 +- test/simple/test-tls-npn-server-client.js | 9 ++++++--- test/simple/test-tls-passphrase.js | 6 ++++-- test/simple/test-tls-pause-close.js | 2 +- test/simple/test-tls-pause.js | 2 +- test/simple/test-tls-peer-certificate.js | 2 +- test/simple/test-tls-remote.js | 2 +- test/simple/test-tls-request-timeout.js | 2 +- test/simple/test-tls-set-encoding.js | 2 +- test/simple/test-tls-sni-server-client.js | 8 +++++--- 14 files changed, 29 insertions(+), 21 deletions(-) diff --git a/test/simple/test-tls-client-abort.js b/test/simple/test-tls-client-abort.js index 19b69f25da..8958ceb158 100644 --- a/test/simple/test-tls-client-abort.js +++ b/test/simple/test-tls-client-abort.js @@ -33,7 +33,7 @@ var path = require('path'); var cert = fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem')); var key = fs.readFileSync(path.join(common.fixturesDir, 'test_key.pem')); -var conn = tls.connect(common.PORT, {cert: cert, key: key}, function() { +var conn = tls.connect({cert: cert, key: key, port: common.PORT}, function() { assert.ok(false); // callback should never be executed }); conn.on('error', function() { diff --git a/test/simple/test-tls-client-resume.js b/test/simple/test-tls-client-resume.js index 2e165596dd..5469c529fa 100644 --- a/test/simple/test-tls-client-resume.js +++ b/test/simple/test-tls-client-resume.js @@ -50,7 +50,7 @@ var server = tls.Server(options, function(socket) { server.listen(common.PORT, function() { var session1 = null; - var client1 = tls.connect(common.PORT, function() { + var client1 = tls.connect({port: common.PORT}, function() { console.log('connect1'); assert.ok(!client1.isSessionReused(), 'Session *should not* be reused.'); session1 = client1.getSession(); @@ -59,7 +59,7 @@ server.listen(common.PORT, function() { client1.on('close', function() { console.log('close1'); - var client2 = tls.connect(common.PORT, {'session': session1}, function() { + var client2 = tls.connect({'session': session1, port: common.PORT}, function() { console.log('connect2'); assert.ok(client2.isSessionReused(), 'Session *should* be reused.'); }); diff --git a/test/simple/test-tls-client-verify.js b/test/simple/test-tls-client-verify.js index 4a1b82aaab..4e5c4abfbf 100644 --- a/test/simple/test-tls-client-verify.js +++ b/test/simple/test-tls-client-verify.js @@ -100,7 +100,7 @@ function testServers(index, servers, clientOptions, cb) { var b = ''; console.error('connecting...'); - var client = tls.connect(common.PORT, clientOptions, function() { + var client = tls.connect(clientOptions, function() { console.error('expected: ' + ok + ' authed: ' + client.authorized); @@ -128,6 +128,7 @@ function runTest(testIndex) { if (!tcase) return; var clientOptions = { + port: common.PORT, ca: tcase.ca.map(loadPEM), key: loadPEM(tcase.key), cert: loadPEM(tcase.cert) diff --git a/test/simple/test-tls-connect-simple.js b/test/simple/test-tls-connect-simple.js index 538efd6931..6c07f4cb02 100644 --- a/test/simple/test-tls-connect-simple.js +++ b/test/simple/test-tls-connect-simple.js @@ -39,12 +39,12 @@ var server = tls.Server(options, function(socket) { }); server.listen(common.PORT, function() { - var client1 = tls.connect(common.PORT, function() { + var client1 = tls.connect({port: common.PORT}, function() { ++clientConnected; client1.end(); }); - var client2 = tls.connect(common.PORT); + var client2 = tls.connect({port: common.PORT}); client2.on('secureConnect', function() { ++clientConnected; client2.end(); diff --git a/test/simple/test-tls-connect.js b/test/simple/test-tls-connect.js index 5e5f42df36..fe2d17ff2f 100644 --- a/test/simple/test-tls-connect.js +++ b/test/simple/test-tls-connect.js @@ -42,7 +42,7 @@ var path = require('path'); assert.ok(errorEmitted); }); - var conn = tls.connect(common.PORT, {cert: cert, key: key}, function() { + var conn = tls.connect({cert: cert, key: key, port: common.PORT}, function() { assert.ok(false); // callback should never be executed }); diff --git a/test/simple/test-tls-npn-server-client.js b/test/simple/test-tls-npn-server-client.js index 95eaf16721..cf8014a50b 100644 --- a/test/simple/test-tls-npn-server-client.js +++ b/test/simple/test-tls-npn-server-client.js @@ -45,25 +45,28 @@ var serverOptions = { NPNProtocols: ['a', 'b', 'c'] }; +var serverPort = common.PORT; + var clientsOptions = [{ + port: serverPort, key: serverOptions.key, cert: serverOptions.cert, crl: serverOptions.crl, NPNProtocols: ['a', 'b', 'c'] },{ + port: serverPort, key: serverOptions.key, cert: serverOptions.cert, crl: serverOptions.crl, NPNProtocols: ['c', 'b', 'e'] },{ + port: serverPort, key: serverOptions.key, cert: serverOptions.cert, crl: serverOptions.crl, NPNProtocols: ['first-priority-unsupported', 'x', 'y'] }]; -var serverPort = common.PORT; - var serverResults = [], clientsResults = []; @@ -74,7 +77,7 @@ server.listen(serverPort, startTest); function startTest() { function connectClient(options, callback) { - var client = tls.connect(serverPort, 'localhost', options, function() { + var client = tls.connect(options, function() { clientsResults.push(client.npnProtocol); client.destroy(); diff --git a/test/simple/test-tls-passphrase.js b/test/simple/test-tls-passphrase.js index 7dbb1d711f..f428e6fd52 100644 --- a/test/simple/test-tls-passphrase.js +++ b/test/simple/test-tls-passphrase.js @@ -46,7 +46,8 @@ var server = tls.Server({ var connectCount = 0; server.listen(common.PORT, function() { - var c = tls.connect(common.PORT, { + var c = tls.connect({ + port: common.PORT, key: key, passphrase: 'passphrase', cert: cert @@ -59,7 +60,8 @@ server.listen(common.PORT, function() { }); assert.throws(function() { - tls.connect(common.PORT, { + tls.connect({ + port: common.PORT, key: key, passphrase: 'invalid', cert: cert diff --git a/test/simple/test-tls-pause-close.js b/test/simple/test-tls-pause-close.js index f7f17d1238..a53d017a13 100644 --- a/test/simple/test-tls-pause-close.js +++ b/test/simple/test-tls-pause-close.js @@ -66,7 +66,7 @@ var server = tls.createServer(options, function(s) { }); server.listen(common.PORT, function() { - var c = tls.connect(common.PORT, function() { + var c = tls.connect({port: common.PORT}, function() { console.log('client connected'); c.socket.on('end', function() { console.log('client socket ended'); diff --git a/test/simple/test-tls-pause.js b/test/simple/test-tls-pause.js index 3fc30018d2..9ca3dfb2bd 100644 --- a/test/simple/test-tls-pause.js +++ b/test/simple/test-tls-pause.js @@ -45,7 +45,7 @@ var server = tls.Server(options, function(socket) { server.listen(common.PORT, function() { var resumed = false; - var client = tls.connect(common.PORT, function() { + var client = tls.connect({port: common.PORT}, function() { client.pause(); common.debug('paused'); send(); diff --git a/test/simple/test-tls-peer-certificate.js b/test/simple/test-tls-peer-certificate.js index fe498422c0..ea3245a562 100644 --- a/test/simple/test-tls-peer-certificate.js +++ b/test/simple/test-tls-peer-certificate.js @@ -42,7 +42,7 @@ var server = tls.createServer(options, function(cleartext) { cleartext.end('World'); }); server.listen(common.PORT, function() { - var socket = tls.connect(common.PORT, function() { + var socket = tls.connect({port: common.PORT}, function() { var peerCert = socket.getPeerCertificate(); common.debug(util.inspect(peerCert)); assert.equal(peerCert.subject.subjectAltName, diff --git a/test/simple/test-tls-remote.js b/test/simple/test-tls-remote.js index 2b92f6191d..9aa51ab416 100644 --- a/test/simple/test-tls-remote.js +++ b/test/simple/test-tls-remote.js @@ -48,7 +48,7 @@ server.listen(common.PORT, '127.0.0.1', function() { assert.equal(server.address().address, '127.0.0.1'); assert.equal(server.address().port, common.PORT); - var c = tls.connect(common.PORT, '127.0.0.1', function() { + var c = tls.connect({port: common.PORT, host: '127.0.0.1'}, function() { assert.equal(c.address().address, c.socket.address().address); assert.equal(c.address().port, c.socket.address().port); diff --git a/test/simple/test-tls-request-timeout.js b/test/simple/test-tls-request-timeout.js index d7ed7016d1..c44ecef3fa 100644 --- a/test/simple/test-tls-request-timeout.js +++ b/test/simple/test-tls-request-timeout.js @@ -42,7 +42,7 @@ var server = tls.Server(options, function(socket) { }); server.listen(common.PORT, function() { - var socket = tls.connect(common.PORT); + var socket = tls.connect({port: common.PORT}); }); process.on('exit', function() { diff --git a/test/simple/test-tls-set-encoding.js b/test/simple/test-tls-set-encoding.js index 556a3b4e0c..8850a677e0 100644 --- a/test/simple/test-tls-set-encoding.js +++ b/test/simple/test-tls-set-encoding.js @@ -41,7 +41,7 @@ var server = tls.Server(options, function(socket) { server.listen(common.PORT, function() { - var client = tls.connect(common.PORT); + var client = tls.connect({port: common.PORT}); var buffer = ''; diff --git a/test/simple/test-tls-sni-server-client.js b/test/simple/test-tls-sni-server-client.js index f67fec7dce..721c2c0241 100644 --- a/test/simple/test-tls-sni-server-client.js +++ b/test/simple/test-tls-sni-server-client.js @@ -57,26 +57,28 @@ var SNIContexts = { } }; +var serverPort = common.PORT; var clientsOptions = [{ + port: serverPort, key: loadPEM('agent1-key'), cert: loadPEM('agent1-cert'), ca: [loadPEM('ca1-cert')], servername: 'a.example.com' },{ + port: serverPort, key: loadPEM('agent2-key'), cert: loadPEM('agent2-cert'), ca: [loadPEM('ca2-cert')], servername: 'b.test.com' },{ + port: serverPort, key: loadPEM('agent3-key'), cert: loadPEM('agent3-cert'), ca: [loadPEM('ca1-cert')], servername: 'c.wrong.com' }]; -var serverPort = common.PORT; - var serverResults = [], clientResults = []; @@ -91,7 +93,7 @@ server.listen(serverPort, startTest); function startTest() { function connectClient(options, callback) { - var client = tls.connect(serverPort, 'localhost', options, function() { + var client = tls.connect(options, function() { clientResults.push(client.authorized); client.destroy();