Allow socket path to propogate from Makefile

Author: pintsized

Makefile

@@ -32,7 +32,7 @@ TEST_SENTINEL_PROMOTION_TIME  ?= 20
 
 # Command line arguments for redis tests
 TEST_REDIS_VARS     = PATH=$(OPENRESTY_PREFIX)/nginx/sbin:$(PATH) \
-TEST_REDIS_SOCKET=unix://$(TEST_REDIS_SOCKET) \
+TEST_NGINX_REDIS_SOCKET=unix://$(TEST_REDIS_SOCKET) \
 TEST_REDIS_DATABASE=$(TEST_REDIS_DATABASE) \
 TEST_NGINX_NO_SHUFFLE=1
 

t/connector.t

@@ -13,6 +13,7 @@ init_by_lua_block {
 
 $ENV{TEST_NGINX_RESOLVER} = '8.8.8.8';
 $ENV{TEST_NGINX_REDIS_PORT} ||= 6379;
+$ENV{TEST_NGINX_REDIS_SOCKET} ||= 'unix://tmp/redis/redis.sock';
 
 no_long_string();
 run_tests();
@@ -213,14 +214,14 @@ GET /t
 ERR Client sent AUTH, but no password is set
 
 
-=== TEST 7: unix domain socket
+=== TEST 7: Bad unix domain socket path should fail
 --- http_config eval: $::HttpConfig
 --- config
 location /t {
     lua_socket_log_errors Off;
     content_by_lua_block {
         local redis,  err = require("resty.redis.connector").new({
-            path = "unix://tmp/redis.sock",
+            path = "unix://GARBAGE_PATH_AKFDKAJSFKJSAFLKJSADFLKJSANCKAJSNCKJSANCLKAJS",
         }):connect()
 
         assert(not redis and err == "no such file or directory",
@@ -233,6 +234,30 @@ GET /t
 [error]
 
 
+=== TEST 7.1: Good unix domain socket path should succeed
+--- http_config eval: $::HttpConfig
+--- config
+location /t {
+    lua_socket_log_errors Off;
+    content_by_lua_block {
+      ngx.log (ngx.DEBUG, "$TEST_NGINX_REDIS_SOCKET")
+        local redis, err = require("resty.redis.connector").new({
+            path = "$TEST_NGINX_REDIS_SOCKET",
+        }):connect()
+
+        assert (redis and not err,
+            "connection should be valid")
+
+
+        redis:close()
+    }
+}
+--- request
+GET /t
+--- no_error_log
+[error]
+
+
 === TEST 8: parse_dsn
 --- http_config eval: $::HttpConfig
 --- config