added (passing) test cases for using nginx variables in redis_pass, which requires variables_in_redis_pass.patch for ngx_redis 0.3.6.

agentzh · agentzh · commit af8dbefca53e · 2013-03-21T22:25:42.000-07:00
diff --git a/t/redis.t b/t/redis.t
@@ -13,7 +13,7 @@ $ENV{TEST_NGINX_REDIS_PORT} ||= 6379;
 #no_long_string();
 no_shuffle();
 
-log_level('warn');
+#log_level('warn');
 run_tests();
 
 __DATA__
@@ -125,3 +125,123 @@ hiya
 --- no_error_log
 [error]
 
+
+
+=== TEST 4: flush all - cluster
+--- config
+    location /flush {
+        redis2_query flushall;
+        redis2_pass 127.0.0.1:$TEST_NGINX_REDIS_PORT;
+    }
+--- response_headers
+Content-Type: text/plain
+!Content-Length
+--- request
+GET /flush
+--- response_body eval: "+OK\r\n"
+--- no_error_log
+[error]
+
+
+
+=== TEST 5: basic fetch (cache miss) - cluster
+--- timeout: 3
+--- http_config
+    upstream foo {
+        server 127.0.0.1:$TEST_NGINX_REDIS_PORT;
+    }
+--- config
+    location /foo {
+        default_type text/css;
+
+        set $key $uri;
+        set_escape_uri $escaped_key $key;
+        #srcache_fetch GET /redis $key;
+        srcache_store POST /redis2 key=$escaped_key&exptime=120;
+
+        echo hello;
+        echo hiya;
+    }
+
+    location = /redis {
+        internal;
+
+        set_md5 $redis_key $args;
+        set $backend foo;
+        redis_pass $backend;
+    }
+
+    location = /redis2 {
+        internal;
+
+        set_unescape_uri $exptime $arg_exptime;
+        set_unescape_uri $key $arg_key;
+        set_md5 $key;
+        set $backend foo;
+
+        redis2_query set $key $echo_request_body;
+        redis2_query expire $key $exptime;
+        redis2_pass $backend;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+!Content-Length
+--- response_body
+hello
+hiya
+--- no_error_log
+[error]
+
+
+
+=== TEST 6: basic fetch (cache hit) - cluster
+--- http_config
+    upstream foo {
+        server 127.0.0.1:$TEST_NGINX_REDIS_PORT;
+    }
+
+--- config
+    location /foo {
+        default_type text/css;
+
+        set $key $uri;
+        srcache_fetch GET /redis $key;
+        srcache_store PUT /redis2 key=$key&exptime=10;
+
+        echo world;
+    }
+
+    location = /redis {
+        #internal;
+
+        set_md5 $redis_key $args;
+        set $backend foo;
+        redis_pass $backend;
+    }
+
+    location = /redis2 {
+        internal;
+
+        set_unescape_uri $exptime $arg_exptime;
+        set_unescape_uri $key $arg_key;
+        set_md5 $key;
+
+        redis2_query set $key $echo_request_body;
+        redis2_query expire $key $exptime;
+
+        set $backend foo;
+        redis2_pass $backend;
+    }
+--- request
+GET /foo
+--- response_headers
+Content-Type: text/css
+Content-Length: 11
+--- response_body
+hello
+hiya
+--- no_error_log
+[error]
+
diff --git a/util/build.sh b/util/build.sh
@@ -7,6 +7,13 @@ version=$1
 home=~
 force=$2
 
+ngx_redis_version=0.3.6
+ngx_redis_path=$home/work/nginx/ngx_http_redis-$ngx_redis_version
+
+cd $ngx_redis_path
+patch -N -p1 < $root/../ngx_openresty/patches/ngx_http_redis-$ngx_redis_version-variables_in_redis_pass.patch
+cd $root
+
             #--without-http_memcached_module \
 ngx-build $force $version \
             --with-cc-opt="-O0" \
@@ -22,7 +29,7 @@ ngx-build $force $version \
             --without-http_userid_module \
             --add-module=$root/../ndk-nginx-module \
             --add-module=$root/../set-misc-nginx-module \
-          --add-module=$home/work/nginx/ngx_http_redis-0.3.6 \
+          --add-module=$ngx_redis_path \
           --add-module=$root/../xss-nginx-module \
           --add-module=$root/../redis2-nginx-module \
           --add-module=$root/../eval-nginx-module \
