From 6d593a902685dfaf2c85304faa00a051e4b13f16 Mon Sep 17 00:00:00 2001 From: isaacs Date: Thu, 7 Mar 2013 12:04:17 -0800 Subject: [PATCH] test: Don't fail tls-session-cache if openssl is bad --- test/simple/test-tls-session-cache.js | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/test/simple/test-tls-session-cache.js b/test/simple/test-tls-session-cache.js index 695a75984..fdc4ae17d 100644 --- a/test/simple/test-tls-session-cache.js +++ b/test/simple/test-tls-session-cache.js @@ -51,6 +51,7 @@ function doTest() { }; var requestCount = 0; var session; + var badOpenSSL = false; var server = tls.createServer(options, function(cleartext) { cleartext.on('error', function(er) { @@ -88,18 +89,30 @@ function doTest() { '-reconnect', '-no_ticket' ], { - customFds: [0, 1, 2] + stdio: [ 0, 1, 'pipe' ] + }); + var err = ''; + client.stderr.setEncoding('utf8'); + client.stderr.on('data', function(chunk) { + err += chunk; }); client.on('exit', function(code) { - assert.equal(code, 0); + if (/^unknown option/.test(err)) { + // using an incompatible version of openssl + assert(code); + badOpenSSL = true; + } else + assert.equal(code, 0); server.close(); }); }); process.on('exit', function() { - assert.ok(session); + if (!badOpenSSL) { + assert.ok(session); - // initial request + reconnect requests (5 times) - assert.equal(requestCount, 6); + // initial request + reconnect requests (5 times) + assert.equal(requestCount, 6); + } }); }