redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-07 13:22:56 +03:00
Code Activity

tests: fix tls tests and enable stunnel tests for travis

Browse Source
This commit is contained in:
Salakar
2020-02-06 21:27:49 +00:00
parent fbdac9e0ad
commit 7c551bf474
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/tls.spec.js
View File

@@ -19,9 +19,6 @@ var tls_port = 6380;
// Use skip instead of returning to indicate what tests really got skipped // Use skip instead of returning to indicate what tests really got skipped
var skip = false; var skip = false;
// Wait until stunnel4 is in the travis whitelist
// Check: https://github.com/travis-ci/apt-package-whitelist/issues/403
// If this is merged, remove the travis env checks
describe('TLS connection tests', function () { describe('TLS connection tests', function () {
before(function (done) { before(function (done) {
@@ -29,9 +26,6 @@ describe('TLS connection tests', function () {
if (process.platform === 'win32') { if (process.platform === 'win32') {
skip = true; skip = true;
console.warn('\nStunnel tests do not work on windows atm. If you think you can fix that, it would be warmly welcome.\n'); console.warn('\nStunnel tests do not work on windows atm. If you think you can fix that, it would be warmly welcome.\n');
} else if (process.env.TRAVIS === 'true') {
skip = true;
console.warn('\nTravis does not support stunnel right now. Skipping tests.\nCheck: https://github.com/travis-ci/apt-package-whitelist/issues/403\n');
} }
if (skip) return done(); if (skip) return done();
helper.stopStunnel(function () { helper.stopStunnel(function () {
@@ -58,7 +52,7 @@ describe('TLS connection tests', function () {
client = redis.createClient({ client = redis.createClient({
connect_timeout: connect_timeout, connect_timeout: connect_timeout,
port: tls_port, port: tls_port,
tls: tls_options tls: utils.clone(tls_options)
}); });
var time = 0; var time = 0;
assert.strictEqual(client.address, '127.0.0.1:' + tls_port); assert.strictEqual(client.address, '127.0.0.1:' + tls_port);
@@ -109,12 +103,14 @@ describe('TLS connection tests', function () {
client.get('foo', helper.isString('bar', done)); client.get('foo', helper.isString('bar', done));
}); });
describe('using rediss as url protocol', function (done) { describe('using rediss as url protocol', function () {
var tls_connect = tls.connect; var tls_connect = tls.connect;
beforeEach(function () { beforeEach(function () {
tls.connect = function (options) { tls.connect = function (options) {
options = utils.clone(options); options = utils.clone(options);
options.ca = tls_options.ca; options.ca = tls_options.ca;
options.servername = 'redis.js.org';
options.rejectUnauthorized = true;
return tls_connect.call(tls, options); return tls_connect.call(tls, options);
}; };
}); });