redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-06 02:15:48 +03:00
Code Activity

Skip tls tests on windows and stunnel

Browse Source 
This will also remove the libwrap option to work on arch
This commit is contained in:
Ruben Bridgewater
2015-11-07 14:37:35 +01:00
parent 0596480b03
commit b91692e928
6 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
index.js
View File

@@ -46,6 +46,7 @@ function RedisClient (options) {
cnx_options.family = (!options.family && net.isIP(cnx_options.host)) || (options.family === 'IPv6' ? 6 : 4);
this.address = cnx_options.host + ':' + cnx_options.port;
}
/* istanbul ignore next: travis does not work with stunnel atm. Therefor the tls tests are skipped on travis */
for (var tls_option in options.tls) { // jshint ignore: line
cnx_options[tls_option] = options.tls[tls_option];
}
@@ -91,7 +92,7 @@ function RedisClient (options) {
this.options = options;
// Init parser once per instance
this.init_parser();
self.create_stream();
this.create_stream();
}
util.inherits(RedisClient, events.EventEmitter);
@@ -105,6 +106,7 @@ RedisClient.prototype.create_stream = function () {
this.stream.destroy();
}
/* istanbul ignore if: travis does not work with stunnel atm. Therefor the tls tests are skipped on travis */
if (this.options.tls) {
this.stream = tls.connect(this.connection_options);
} else {
@@ -118,8 +120,9 @@ RedisClient.prototype.create_stream = function () {
});
}
/* istanbul ignore next: travis does not work with stunnel atm. Therefor the tls tests are skipped on travis */
var connect_event = this.options.tls ? "secureConnect" : "connect";
this.stream.on(connect_event, function () {
this.stream.once(connect_event, function () {
this.removeAllListeners("timeout");
self.on_connect();
});
@@ -134,6 +137,7 @@ RedisClient.prototype.create_stream = function () {
self.on_error(err);
});
/* istanbul ignore next: travis does not work with stunnel atm. Therefor the tls tests are skipped on travis */
this.stream.on('clientError', function (err) {
self.on_error(err);
});