test: add some test cases with HUP to reload, and fix the num of cases.

Author: jinhua.tan

src/ngx_http_lua_directive.c

@@ -1228,8 +1228,6 @@ ngx_http_lua_exit_worker_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
     ngx_str_t                   *value;
     ngx_http_lua_main_conf_t    *lmcf = conf;
 
-    dd("enter");
-
     /*  must specify a content handler */
     if (cmd->post == NULL) {
         return NGX_CONF_ERROR;

t/089-phase.t

@@ -8,7 +8,7 @@ log_level('warn');
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2 + 1);
+plan tests => repeat_each() * (blocks() * 2) + 3;
 
 #no_diff();
 #no_long_string();
@@ -183,7 +183,7 @@ init_worker
 --- http_config
     exit_worker_by_lua_block {
         local phase = ngx.get_phase()
-        ngx.log(ngx.NOTICE, phase)
+        ngx.log(ngx.ERR, phase)
     }
 --- config
     location /lua {
@@ -196,4 +196,4 @@ GET /lua
 --- response_body
 ok
 --- shutdown_error_log
-exit_worker
+exit_worker_by_lua:3: exit_worker

t/151-exit-worker.t renamed to t/162-exit-worker.t

@@ -4,7 +4,7 @@ use Test::Nginx::Socket::Lua;
 
 repeat_each(2);
 
-plan tests => repeat_each() * (blocks() * 2);
+plan tests => repeat_each() * (blocks() * 2 + 2);
 
 #log_level("warn");
 no_long_string();

t/163-exit-worker-hup.t

@@ -0,0 +1,86 @@
+# vim:set ft= ts=4 sw=4 et fdm=marker:
+
+our $SkipReason;
+
+BEGIN {
+    if ($ENV{TEST_NGINX_CHECK_LEAK}) {
+        $SkipReason = "unavailable for the hup tests";
+
+    } else {
+        $ENV{TEST_NGINX_USE_HUP} = 1;
+        undef $ENV{TEST_NGINX_USE_STAP};
+    }
+}
+
+use Test::Nginx::Socket::Lua $SkipReason ? (skip_all => $SkipReason) : ();
+
+repeat_each(2);
+
+plan tests => repeat_each() * (blocks() * 2 + 2);
+
+no_long_string();
+
+worker_connections(1024);
+run_tests();
+
+__DATA__
+
+=== TEST 1: simple exit_worker_by_lua_block with hup
+--- http_config
+    exit_worker_by_lua_block {
+        ngx.log(ngx.NOTICE, "log from exit_worker_by_lua_block")
+    }
+--- config
+    location /t {
+        content_by_lua_block {
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+ok
+--- shutdown_error_log
+log from exit_worker_by_lua_block
+
+
+
+=== TEST 2: exit after worker_shutdown_timeout
+--- main_config
+    worker_shutdown_timeout 1;
+--- http_config
+    exit_worker_by_lua_block {
+        ngx.log(ngx.NOTICE, "log from exit_worker_by_lua_block")
+    }
+
+    server {
+        listen 12345;
+
+        location = /t {
+            echo 'hello world';
+        }
+    }
+--- config
+    location /t {
+        content_by_lua_block {
+            ngx.timer.at(0, function ()
+                local sock = ngx.socket.tcp()
+                sock:connect("127.0.0.1", 12345)
+                local reader = sock:receiveuntil("unknow")
+                ngx.log(ngx.NOTICE, "reading to block the exiting")
+                reader()
+            end)
+
+            ngx.sleep(0)
+
+            ngx.say("ok")
+        }
+    }
+--- request
+GET /t
+--- response_body
+ok
+--- error_log
+reading to block the exiting
+--- shutdown_error_log
+log from exit_worker_by_lua_block