From d34dcc8b07021748bfaa4fa295601bd14c506129 Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Thu, 23 Jul 2015 22:14:51 +0200 Subject: [PATCH 1/5] Check for REDIS HOST and PORT environment varibles --- test/test.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/test.js b/test/test.js index e7db763914..638747303f 100644 --- a/test/test.js +++ b/test/test.js @@ -1,6 +1,6 @@ /*global require console setTimeout process Buffer */ -var PORT = 6379; -var HOST = '127.0.0.1'; +var PORT = process.env.REDIS_1_PORT_6379_TCP_PORT || 6379; +var HOST = process.env.REDIS_1_PORT_6379_TCP_ADDR || '127.0.0.1'; var parser = process.argv[3]; var redis = require("../index"), @@ -116,7 +116,8 @@ next = function next(name) { // Tests are run in the order they are defined, so FLUSHDB should always be first. tests.IPV4 = function () { - var ipv4Client = redis.createClient( PORT, "127.0.0.1", { family : "IPv4", parser: parser } ); + var ipv4addr = process.env.REDIS_1_PORT_6379_TCP_ADDR || "127.0.0.1"; + var ipv4Client = redis.createClient( PORT, ipv4addr, { family : "IPv4", parser: parser } ); ipv4Client.once("ready", function start_tests() { console.log("Connected to " + ipv4Client.address + ", Redis server version " + ipv4Client.server_info.redis_version + "\n"); @@ -142,7 +143,8 @@ tests.IPV6 = function () { console.log("Skipping IPV6 for old Redis server version < 2.8.0"); return run_next_test(); } - var ipv6Client = redis.createClient( PORT, "::1", { family: "IPv6", parser: parser } ); + var ipv6addr = process.env.REDIS_1_PORT_6379_TCP_ADDR || "::1"; + var ipv6Client = redis.createClient( PORT, ipv6addr, { family: "IPv6", parser: parser } ); ipv6Client.once("ready", function start_tests() { console.log("Connected to " + ipv6Client.address + ", Redis server version " + ipv6Client.server_info.redis_version + "\n"); From e646b4eb3970df11572163a74728c2852452bfea Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Thu, 23 Jul 2015 22:16:07 +0200 Subject: [PATCH 2/5] Skip SOCKET test if Redis is not listening on a socket --- test/test.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/test.js b/test/test.js index 638747303f..8344d14b5f 100644 --- a/test/test.js +++ b/test/test.js @@ -166,6 +166,15 @@ tests.IPV6 = function () { } tests.UNIX_SOCKET = function () { + try { + var stat = require('fs').accessSync('/tmp/redis.sock'); + } catch(err) { + if (err.code === 'ENOENT') { + console.log("Skipping SOCKET since none exists"); + return run_next_test(); + } + } + var unixClient = redis.createClient('/tmp/redis.sock', { parser: parser }); // if this fails, check the permission of unix socket. From 8b5ce1088a555174d2202a8852a7ecae6f969a3c Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Thu, 23 Jul 2015 22:16:48 +0200 Subject: [PATCH 3/5] Allways pass HOST and PORT when creating a new client --- test/test.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/test.js b/test/test.js index 8344d14b5f..955af604b4 100644 --- a/test/test.js +++ b/test/test.js @@ -739,7 +739,7 @@ tests.WATCH_TRANSACTION = function () { tests.detect_buffers = function () { - var name = "detect_buffers", detect_client = redis.createClient({ detect_buffers: true, parser: parser }); + var name = "detect_buffers", detect_client = redis.createClient(PORT, HOST, { detect_buffers: true, parser: parser }); detect_client.on("ready", function () { // single Buffer or String @@ -804,7 +804,7 @@ tests.detect_buffers = function () { }; tests.detect_buffers_multi = function () { - var name = "detect_buffers_multi", detect_client = redis.createClient({detect_buffers: true}); + var name = "detect_buffers_multi", detect_client = redis.createClient(PORT, HOST, {detect_buffers: true}); detect_client.on("ready", function () { // single Buffer or String @@ -895,9 +895,9 @@ tests.detect_buffers_multi = function () { tests.socket_nodelay = function () { var name = "socket_nodelay", c1, c2, c3, ready_count = 0, quit_count = 0; - c1 = redis.createClient({ socket_nodelay: true, parser: parser }); - c2 = redis.createClient({ socket_nodelay: false, parser: parser }); - c3 = redis.createClient({ parser: parser }); + c1 = redis.createClient(PORT, HOST, { socket_nodelay: true, parser: parser }); + c2 = redis.createClient(PORT, HOST, { socket_nodelay: false, parser: parser }); + c3 = redis.createClient(PORT, HOST, { parser: parser }); function quit_check() { quit_count++; @@ -1258,8 +1258,8 @@ tests.SUBSCRIBE_QUIT = function () { tests.SUBSCRIBE_CLOSE_RESUBSCRIBE = function () { var name = "SUBSCRIBE_CLOSE_RESUBSCRIBE"; - var c1 = redis.createClient({ parser: parser }); - var c2 = redis.createClient({ parser: parser }); + var c1 = redis.createClient(PORT, HOST, { parser: parser }); + var c2 = redis.createClient(PORT, HOST, { parser: parser }); var count = 0; /* Create two clients. c1 subscribes to two channels, c2 will publish to them. @@ -2055,7 +2055,7 @@ tests.MONITOR = function () { return next(name); } - monitor_client = redis.createClient({ parser: parser }); + monitor_client = redis.createClient(PORT, HOST, { parser: parser }); monitor_client.monitor(function (err, res) { client.mget("some", "keys", "foo", "bar"); client.set("json", JSON.stringify({ @@ -2329,7 +2329,7 @@ tests.reconnectRetryMaxDelay = function() { tests.unref = function () { var name = "unref"; - var external = fork("./test/test-unref.js"); + var external = fork("./test/test-unref.js", [PORT, HOST]); var done = false; external.on("close", function (code) { assert(code == 0, "test-unref.js failed"); From da535a697768a8f8617544d3a37adb754c3d5f8b Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Fri, 24 Jul 2015 08:07:33 +0200 Subject: [PATCH 4/5] Normalize linked REDIS environment variables --- test/test.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test.js b/test/test.js index 955af604b4..a4c79e4f3b 100644 --- a/test/test.js +++ b/test/test.js @@ -1,6 +1,6 @@ /*global require console setTimeout process Buffer */ -var PORT = process.env.REDIS_1_PORT_6379_TCP_PORT || 6379; -var HOST = process.env.REDIS_1_PORT_6379_TCP_ADDR || '127.0.0.1'; +var PORT = process.env.REDIS_PORT_6379_TCP_PORT || 6379; +var HOST = process.env.REDIS_PORT_6379_TCP_ADDR || '127.0.0.1'; var parser = process.argv[3]; var redis = require("../index"), @@ -116,7 +116,7 @@ next = function next(name) { // Tests are run in the order they are defined, so FLUSHDB should always be first. tests.IPV4 = function () { - var ipv4addr = process.env.REDIS_1_PORT_6379_TCP_ADDR || "127.0.0.1"; + var ipv4addr = process.env.REDIS_PORT_6379_TCP_ADDR || "127.0.0.1"; var ipv4Client = redis.createClient( PORT, ipv4addr, { family : "IPv4", parser: parser } ); ipv4Client.once("ready", function start_tests() { @@ -143,7 +143,7 @@ tests.IPV6 = function () { console.log("Skipping IPV6 for old Redis server version < 2.8.0"); return run_next_test(); } - var ipv6addr = process.env.REDIS_1_PORT_6379_TCP_ADDR || "::1"; + var ipv6addr = process.env.REDIS_PORT_6379_TCP_ADDR || "::1"; var ipv6Client = redis.createClient( PORT, ipv6addr, { family: "IPv6", parser: parser } ); ipv6Client.once("ready", function start_tests() { From b1ae21d221fd96d34e0a347630df31c0afd380a6 Mon Sep 17 00:00:00 2001 From: Hans Kristian Flaatten Date: Fri, 24 Jul 2015 15:33:37 +0200 Subject: [PATCH 5/5] Revert "Skip SOCKET test if Redis is not listening on a socket" This reverts commit e646b4eb3970df11572163a74728c2852452bfea. --- test/test.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/test/test.js b/test/test.js index a4c79e4f3b..48dd86a56b 100644 --- a/test/test.js +++ b/test/test.js @@ -166,15 +166,6 @@ tests.IPV6 = function () { } tests.UNIX_SOCKET = function () { - try { - var stat = require('fs').accessSync('/tmp/redis.sock'); - } catch(err) { - if (err.code === 'ENOENT') { - console.log("Skipping SOCKET since none exists"); - return run_next_test(); - } - } - var unixClient = redis.createClient('/tmp/redis.sock', { parser: parser }); // if this fails, check the permission of unix socket.