From 5760a3327b1e3623fd95f7c2c1f4a6a0ec665e5e Mon Sep 17 00:00:00 2001 From: lijunlong Date: Fri, 6 Nov 2026 10:26:24 +0800 Subject: [PATCH] tests: improve test isolation for parallel runs. Replace global memcached flushes with read-only probes or single-key writes, and isolate stored values with per-process test key prefixes. Use allocated TLS ports so concurrent test files do not share listeners. Make receiveany assertions independent of TCP fragmentation, flush output explicitly in abort and semaphore checks, and allow more time for TLS callback cancellation. Separate Lua VM pool cleanup from idle timeout and re-enable preread keepalive coverage on newer nginx versions. Validation: git diff --cached --check passes. A 10-job run of all 23 changed test files passes 20 files. Google TLS handshakes fail in 129-ssl-socket.t and 170-ssl-session-reuse.t. Queue regressions fail in 068-socket-keepalive.t with the existing nginx 1.31.0 binary, which was built before the branch's connection pool fixes. No rebuild was run. --- t/023-preread/socket-keepalive.t | 34 +++++++++------------------ t/025-codecache.t | 12 +++++----- t/058-tcp-socket.t | 24 +++++++++---------- t/060-lua-memcached.t | 10 ++++---- t/065-tcp-socket-timeout.t | 2 +- t/066-socket-receiveuntil.t | 4 ++-- t/067-req-socket.t | 40 +++++++++++++++++++++----------- t/068-socket-keepalive.t | 22 +++++++++--------- t/071-idle-socket.t | 19 ++++++++------- t/087-udp-socket.t | 24 +++++++++---------- t/093-uthread-spawn.t | 4 ++-- t/100-client-abort.t | 26 +++++++++++++++++---- t/106-timer.t | 12 +++++----- t/108-timer-safe.t | 12 +++++----- t/124-init-worker.t | 8 +++---- t/128-duplex-tcp-socket.t | 18 +++++++------- t/129-ssl-socket.t | 23 +++++++++--------- t/139-ssl-cert-by.t | 6 ++--- t/154-semaphore.t | 8 ++++++- t/162-ssl-client-hello-by.t | 18 +++++++------- t/164-proxy-ssl-verify-by.t | 12 ++++++---- t/165-proxy-ssl-cert-by.t | 12 ++++++---- t/170-ssl-session-reuse.t | 5 ++-- 23 files changed, 195 insertions(+), 160 deletions(-) diff --git a/t/023-preread/socket-keepalive.t b/t/023-preread/socket-keepalive.t index 43d6344b..24b2c052 100644 --- a/t/023-preread/socket-keepalive.t +++ b/t/023-preread/socket-keepalive.t @@ -1,18 +1,6 @@ # vim:set ft= ts=4 sw=4 et fdm=marker: -our $SkipReason; - -BEGIN { - use Test::Nginx::Util; - - my $nginx_version = Test::Nginx::Util::get_nginx_version(); - - if (eval "$nginx_version >= 1.25.5") { - $SkipReason = "Nginx version greater than 1.25.5 have changed behavior, current version $nginx_version"; - } -} - -use Test::Nginx::Socket::Lua::Stream $SkipReason ? (skip_all => $SkipReason) : (); +use Test::Nginx::Socket::Lua::Stream; repeat_each(2); @@ -62,7 +50,7 @@ function go(port) ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes()) - local req = "flush_all\r\n" + local req = "set abc 0 60 5\r\nhello\r\n" local bytes, err = sock:send(req) if not bytes then @@ -86,11 +74,11 @@ function go(port) end --- stream_response_like ^connected: 1, reused: \d+ -request sent: 11 -received: OK +request sent: 23 +received: STORED connected: 1, reused: [1-9]\d* -request sent: 11 -received: OK +request sent: 23 +received: STORED --- no_error_log eval ["[error]", "lua tcp socket keepalive: free connection pool for "] @@ -134,7 +122,7 @@ function go(port, keepalive) ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes()) - local req = "flush_all\r\n" + local req = "set abc 0 60 5\r\nhello\r\n" local bytes, err = sock:send(req) if not bytes then @@ -163,11 +151,11 @@ function go(port, keepalive) end --- stream_response_like ^connected: 1, reused: \d+ -request sent: 11 -received: OK +request sent: 23 +received: STORED connected: 1, reused: [1-9]\d* -request sent: 11 -received: OK +request sent: 23 +received: STORED --- no_error_log [error] --- error_log eval diff --git a/t/025-codecache.t b/t/025-codecache.t index 31a056e7..a5826330 100644 --- a/t/025-codecache.t +++ b/t/025-codecache.t @@ -779,7 +779,7 @@ qr/\[alert\] \S+ stream lua_code_cache is off; this will hurt performance/, -=== TEST 22: cosocket connection pool timeout (after Lua VM destroys) +=== TEST 22: cosocket connection pool cleanup when the Lua VM is destroyed --- stream_config eval "lua_package_path '$::HtmlDir/?.lua;./?.lua;;';" --- stream_server_config @@ -803,7 +803,7 @@ function go(port) ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes()) - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -820,7 +820,7 @@ function go(port) ngx.say("failed to receive a line: ", err, " [", part, "]") end - local ok, err = sock:setkeepalive(1) + local ok, err = sock:setkeepalive(0) if not ok then ngx.say("failed to set reusable: ", err) end @@ -828,7 +828,7 @@ end --- stream_response connected: 1, reused: 0 request sent: 11 -received: OK +received: END --- no_error_log [error] stream lua tcp socket keepalive max idle timeout @@ -866,7 +866,7 @@ function go(port) ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes()) - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -892,7 +892,7 @@ end --- stream_response connected: 1, reused: 0 request sent: 11 -received: OK +received: END --- no_error_log [error] --- error_log eval diff --git a/t/058-tcp-socket.t b/t/058-tcp-socket.t index 15873d47..c24f962f 100644 --- a/t/058-tcp-socket.t +++ b/t/058-tcp-socket.t @@ -972,7 +972,7 @@ function go(port) ngx.say("connected: ", ok) end - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -992,7 +992,7 @@ end --- stream_response_like eval "^(?:connected: 1 request sent: 11 -received: OK|failed to send request: closed)\$" +received: END|failed to send request: closed)\$" @@ -1032,7 +1032,7 @@ function go(port) return end - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -1058,7 +1058,7 @@ M(http-lua-info) { --- stream_response_like eval qr/^(?:connected: 1 request sent: 11 -received: OK|failed to receive a line: closed \[nil\])$/ +received: END|failed to receive a line: closed \[nil\])$/ @@ -1098,7 +1098,7 @@ function go(port) return end - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -1118,7 +1118,7 @@ end --- stream_response_like eval qr/^(?:connected: 1 request sent: 11 -received: OK|failed to close: closed)$/ +received: END|failed to close: closed)$/ @@ -1158,7 +1158,7 @@ function go(port) ngx.say("connected again: ", ok) end - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -1178,7 +1178,7 @@ end --- stream_response_like eval qr/^(?:connected(?: again)?: 1 request sent: 11 -received: OK +received: END ){2}$/ --- error_log lua reuse socket upstream ctx @@ -1210,7 +1210,7 @@ lua reuse socket upstream ctx ngx.say("connected again: ", ok) - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -1234,7 +1234,7 @@ lua reuse socket upstream ctx connected: 1 connected again: 1 request sent: 11 -received: OK +received: END close: 1 nil --- no_error_log [error] @@ -1268,7 +1268,7 @@ close: 1 nil ngx.say("2: connected: ", ok) - local req1 = "flush_all\r\n" + local req1 = "get __nil\r\n" local bytes, err = sock1:send(req1) if not bytes then ngx.say("1: failed to send request: ", err) @@ -1318,7 +1318,7 @@ close: 1 nil 2: connected: 1 1: request sent: 11 2: request sent: 57 -1: received: OK +1: received: END 2: received: HTTP/1.1 200 OK 1: close: 1 nil 2: close: 1 nil diff --git a/t/060-lua-memcached.t b/t/060-lua-memcached.t index a1d70c36..f0346d5b 100644 --- a/t/060-lua-memcached.t +++ b/t/060-lua-memcached.t @@ -9,6 +9,8 @@ plan tests => repeat_each() * (blocks() * 3 + 1); our $HtmlDir = html_dir; $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211; +# Isolate keys from other files and concurrent runs of this file. +$ENV{TEST_NGINX_MEMCACHED_PREFIX} = "stream_lua_nginx_060_memcached_$$"; my $pwd = `pwd`; chomp $pwd; @@ -34,8 +36,8 @@ __DATA__ local memc = Memcached.Connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT) - memc:set("some_key", "hello 1234") - local data = memc:get("some_key") + memc:set("$TEST_NGINX_MEMCACHED_PREFIX:1:some_key", "hello 1234", 600) + local data = memc:get("$TEST_NGINX_MEMCACHED_PREFIX:1:some_key") ngx.say("some_key: ", data) } --- stream_response @@ -53,13 +55,13 @@ some_key: hello 1234 local memcached = require "resty.memcached" local memc, err = memcached.connect("127.0.0.1", $TEST_NGINX_MEMCACHED_PORT) - local ok, err = memc:set("some_key", "hello 1234") + local ok, err = memc:set("$TEST_NGINX_MEMCACHED_PREFIX:2:some_key", "hello 1234", 600) if not ok then ngx.log(ngx.ERR, "failed to set some_key: ", err) ngx.exit(500) end - local data, err = memc:get("some_key") + local data, err = memc:get("$TEST_NGINX_MEMCACHED_PREFIX:2:some_key") if not data and err then ngx.log(ngx.ERR, "failed to get some_key: ", err) ngx.exit(500) diff --git a/t/065-tcp-socket-timeout.t b/t/065-tcp-socket-timeout.t index 2db1d952..680c6d60 100644 --- a/t/065-tcp-socket-timeout.t +++ b/t/065-tcp-socket-timeout.t @@ -816,7 +816,7 @@ lua tcp socket read timed out ngx.sleep(0.001) end - local bytes, err = sock:send("flush_all") + local bytes, err = sock:send("get __nil") ngx.say("send: ", bytes, " ", err) local ok, err = sock:close() diff --git a/t/066-socket-receiveuntil.t b/t/066-socket-receiveuntil.t index ae7e7d12..7e1e4716 100644 --- a/t/066-socket-receiveuntil.t +++ b/t/066-socket-receiveuntil.t @@ -32,7 +32,7 @@ __DATA__ ngx.say("connected: ", ok) - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -56,7 +56,7 @@ __DATA__ --- stream_response connected: 1 request sent: 11 -received: OK +received: END close: 1 nil --- no_error_log [error] diff --git a/t/067-req-socket.t b/t/067-req-socket.t index 6433fe56..861b08d6 100644 --- a/t/067-req-socket.t +++ b/t/067-req-socket.t @@ -836,11 +836,20 @@ GC cycle done return end ngx.log(ngx.INFO, "Got raw req socket") - local data, err = sock:receiveany(500) - if not data then - ngx.log(ngx.ERR, "server: failed to receive: ", err) - return + local chunks = {} + local received = 0 + while received < 5 do + local data, err = sock:receiveany(500) + if not data then + ngx.log(ngx.ERR, "server: failed to receive: ", err) + return + end + + chunks[#chunks + 1] = data + received = received + #data end + + local data = table.concat(chunks) ngx.log(ngx.INFO, "Got: ", #data, " bytes") local bytes, err = sock:send("1: received: " .. data .. "\n") @@ -874,6 +883,7 @@ Got: 5 bytes ngx.sleep(0.2) ngx.log(ngx.INFO, 'receiveany every 3 bytes per read ...') local i = 0 + local chunks = {} while true do i = i + 1 ngx.log(ngx.INFO, 'reading: ', i) @@ -899,22 +909,24 @@ Got: 5 bytes end end ngx.log(ngx.INFO, "Time ", i, " - got ", #data, " bytes: ", data) - sock:send("receive: " .. data .. "\n") + if #data == 0 or #data > 3 then + ngx.log(ngx.ERR, "unexpected receiveany chunk size: ", #data) + return + end + + chunks[i] = data + end + + local ok, err = sock:send("receive: " .. table.concat(chunks) .. "\n") + if not ok then + ngx.log(ngx.ERR, "failed to send: ", err) end } --- stream_request: hello, stream receiveany! --- stream_response ok -receive: hel -receive: lo, -receive: st -receive: rea -receive: m r -receive: ece -receive: ive -receive: any -receive: ! +receive: hello, stream receiveany! --- no_error_log receiveany error: --- error_log diff --git a/t/068-socket-keepalive.t b/t/068-socket-keepalive.t index 397e72a6..7ba21af9 100644 --- a/t/068-socket-keepalive.t +++ b/t/068-socket-keepalive.t @@ -33,7 +33,7 @@ __DATA__ end ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes()) - local bytes, err = sock:send("flush_all\r\n") + local bytes, err = sock:send("get __nil\r\n") if not bytes then ngx.say("failed to send request: ", err) return @@ -61,10 +61,10 @@ __DATA__ --- stream_response connected: 1, reused: 0 request sent: 11 -received: OK +received: END connected: 1, reused: 1 request sent: 11 -received: OK +received: END --- error_log eval qq{ lua tcp socket get keepalive peer: using connection @@ -92,7 +92,7 @@ lua tcp socket keepalive create connection pool for key "127\.0\.0\.1:$ENV{TEST_ end ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes()) - local bytes, err = sock:send("flush_all\r\n") + local bytes, err = sock:send("get __nil\r\n") if not bytes then ngx.say("failed to send request: ", err) return @@ -125,10 +125,10 @@ lua tcp socket keepalive create connection pool for key "127\.0\.0\.1:$ENV{TEST_ --- stream_response connected: 1, reused: 0 request sent: 11 -received: OK +received: END connected: 1, reused: 1 request sent: 11 -received: OK +received: END --- error_log eval [ "lua tcp socket get keepalive peer: using connection", @@ -1311,7 +1311,7 @@ ok ngx.say("connected: ", ok, ", reused: ", sock:getreusedtimes()) - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then ngx.say("failed to send request: ", err) @@ -1358,10 +1358,10 @@ ok --- stream_response connected: 1, reused: 0 request sent: 11 -received: OK +received: END connected: 1, reused: 1 request sent: 11 -received: OK +received: END reused: 1 reused: 0 --- error_log eval @@ -1615,7 +1615,7 @@ too many waiting connect operations end ngx.log(ngx.WARN, "continue to handle cosocket") - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock3:send(req) if not bytes then ngx.say("failed to send request: ", err) @@ -1638,7 +1638,7 @@ too many waiting connect operations } --- stream_response request sent: 11 -received: OK +received: END setkeepalive: OK --- no_error_log [error] diff --git a/t/071-idle-socket.t b/t/071-idle-socket.t index 8e73219b..544a192a 100644 --- a/t/071-idle-socket.t +++ b/t/071-idle-socket.t @@ -110,7 +110,7 @@ close: 1 nil ngx.say("connected: ", ok) - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -143,7 +143,7 @@ close: 1 nil --- stream_response connected: 1 request sent: 11 -received: OK +received: END request sent again: 11 close: 1 nil --- no_error_log @@ -169,7 +169,7 @@ close: 1 nil ngx.sleep(0.5) - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then ngx.say("failed to send request: ", err) @@ -206,7 +206,7 @@ close: 1 nil ngx.say("connected: ", ok) - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -233,7 +233,7 @@ close: 1 nil --- stream_response connected: 1 request sent: 11 -received: OK +received: END close: 1 nil --- no_error_log [error] @@ -320,7 +320,7 @@ failed to set keepalive: (?:unread data in buffer|connection in dubious state) ngx.say("connected: ", ok) - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -330,7 +330,10 @@ failed to set keepalive: (?:unread data in buffer|connection in dubious state) ngx.say("request sent: ", bytes) - local data, err = sock:receive(1) + -- Matching E first requires reading the following N before the + -- mismatch returns E, leaving N unread even with one-byte reads. + local reader = sock:receiveuntil("EX") + local data, err = reader(1) if not data then ngx.say("failed to read the 1st byte: ", err) return @@ -347,7 +350,7 @@ failed to set keepalive: (?:unread data in buffer|connection in dubious state) --- stream_response eval qq{connected: 1 request sent: 11 -read: O +read: E failed to set keepalive: unread data in buffer } --- no_error_log diff --git a/t/087-udp-socket.t b/t/087-udp-socket.t index bdd5fa91..80e6f08e 100644 --- a/t/087-udp-socket.t +++ b/t/087-udp-socket.t @@ -41,7 +41,7 @@ __DATA__ ngx.say("connected") - local req = "\0\1\0\0\0\1\0\0flush_all\r\n" + local req = "\0\1\0\0\0\1\0\0get __nil\r\n" local ok, err = udp:send(req) if not ok then ngx.say("failed to send: ", err) @@ -59,7 +59,7 @@ __DATA__ --- config server_tokens off; --- stream_response eval -"connected\nreceived 12 bytes: \x{00}\x{01}\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}OK\x{0d}\x{0a}" +"connected\nreceived 13 bytes: \x{00}\x{01}\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}END\x{0d}\x{0a}" --- no_error_log [error] --- log_level: debug @@ -88,14 +88,14 @@ lua udp socket receive buffer size: 8192 ngx.say("connected") - local req = "\0\1\0\0\0\1\0\0flush_all\r\n" + local req = "\0\1\0\0\0\1\0\0get __nil\r\n" local ok, err = udp:send(req) if not ok then ngx.say("failed to send: ", err) return end - req = "\0\2\0\0\0\1\0\0flush_all\r\n" + req = "\0\2\0\0\0\1\0\0get __nil\r\n" ok, err = udp:send(req) if not ok then ngx.say("failed to send: ", err) @@ -123,10 +123,10 @@ lua udp socket receive buffer size: 8192 server_tokens off; --- stream_response_like eval "^connected\n" -."1: received 12 bytes: " -."\x{00}[\1\2]\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}OK\x{0d}\x{0a}" -."2: received 12 bytes: " -."\x{00}[\1\2]\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}OK\x{0d}\x{0a}\$" +."1: received 13 bytes: " +."\x{00}[\1\2]\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}END\x{0d}\x{0a}" +."2: received 13 bytes: " +."\x{00}[\1\2]\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}END\x{0d}\x{0a}\$" --- no_error_log [error] @@ -307,7 +307,7 @@ qr/content_by_lua\(nginx\.conf:\d+\):7: bad request/ ngx.say("connected again: ", ok) - local req = "\0\1\0\0\0\1\0\0flush_all\r\n" + local req = "\0\1\0\0\0\1\0\0get __nil\r\n" local ok, err = sock:send(req) if not ok then ngx.say("failed to send request: ", err) @@ -331,7 +331,7 @@ qr/content_by_lua\(nginx\.conf:\d+\):7: bad request/ "connected: 1 connected again: 1 request sent: 1 -received: \0\1\0\0\0\1\0\0OK\r\n +received: \0\1\0\0\0\1\0\0END\r\n close: 1 nil " --- no_error_log @@ -399,7 +399,7 @@ lua udp socket read timed out ngx.say("connected") - local req = "\0\1\0\0\0\1\0\0flush_all\r\n" + local req = "\0\1\0\0\0\1\0\0get __nil\r\n" local ok, err = udp:send(req) if not ok then ngx.say("failed to send: ", err) @@ -415,7 +415,7 @@ lua udp socket read timed out } --- stream_response eval -"connected\nreceived 12 bytes: \x{00}\x{01}\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}OK\x{0d}\x{0a}" +"connected\nreceived 13 bytes: \x{00}\x{01}\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}END\x{0d}\x{0a}" --- no_error_log [error] --- log_level: debug diff --git a/t/093-uthread-spawn.t b/t/093-uthread-spawn.t index 91267bf5..fdabe8e6 100644 --- a/t/093-uthread-spawn.t +++ b/t/093-uthread-spawn.t @@ -618,7 +618,7 @@ hello from g ngx.say("failed to connect: ", err) return end - local bytes, err = sock:send("flush_all\r\n") + local bytes, err = sock:send("get __nil\r\n") if not bytes then ngx.say("failed to send query: ", err) return @@ -650,7 +650,7 @@ delete thread 2 --- stream_response before after -received: OK +received: END --- no_error_log [error] diff --git a/t/100-client-abort.t b/t/100-client-abort.t index f2d26edc..7f3520ee 100644 --- a/t/100-client-abort.t +++ b/t/100-client-abort.t @@ -478,8 +478,17 @@ receive stream response error: timeout ngx.sleep(0.2) for i = 1, 2 do local ok, err = ngx.say("hello") + if ok then + ok, err = ngx.flush(true) + end + if not ok then - ngx.log(ngx.WARN, "say failed: ", err) + if err ~= "nginx output filter error" and err ~= "client aborted" then + ngx.log(ngx.ERR, "unexpected output error: ", err) + return + end + + ngx.log(ngx.WARN, "say detected client abort") return end end @@ -493,7 +502,7 @@ receive stream response error: timeout [error] [alert] --- error_log -say failed: nginx output filter error +say detected client abort @@ -504,8 +513,17 @@ say failed: nginx output filter error ngx.sleep(0.2) for i = 1, 2 do local ok, err = ngx.print("hello") + if ok then + ok, err = ngx.flush(true) + end + if not ok then - ngx.log(ngx.WARN, "print failed: ", err) + if err ~= "nginx output filter error" and err ~= "client aborted" then + ngx.log(ngx.ERR, "unexpected output error: ", err) + return + end + + ngx.log(ngx.WARN, "print detected client abort") return end end @@ -519,7 +537,7 @@ receive stream response error: timeout [error] [alert] --- error_log -print failed: nginx output filter error +print detected client abort diff --git a/t/106-timer.t b/t/106-timer.t index 192817de..af3d509e 100644 --- a/t/106-timer.t +++ b/t/106-timer.t @@ -348,7 +348,7 @@ function go(port) print("connected: ", ok, ", reused: ", sock:getreusedtimes()) - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -396,7 +396,7 @@ qr/\[lua\] .*? my lua timer handler/, "stream lua close fake stream connection", qr/go\(\): connected: 1, reused: \d+/, "go(): request sent: 11", -"go(): received: OK", +"go(): received: END", ] @@ -469,7 +469,7 @@ qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0(?:[^.]|\.00)/, print("connected: ", ok) - local req = "\0\1\0\0\0\1\0\0flush_all\r\n" + local req = "\0\1\0\0\0\1\0\0get __nil\r\n" local ok, err = udp:send(req) if not ok then fail("failed to send: ", err) @@ -515,7 +515,7 @@ qr/\[lua\] .*? my lua timer handler/, "lua ngx.timer expired", "stream lua close fake stream connection", "connected: 1", -"received 12 bytes: \x{00}\x{01}\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}OK\x{0d}\x{0a}" +"received 13 bytes: \x{00}\x{01}\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}END\x{0d}\x{0a}" ] @@ -612,7 +612,7 @@ function go(port) print("connected: ", ok, ", reused: ", sock:getreusedtimes()) - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -659,7 +659,7 @@ qr/\[lua\] .*? my lua timer handler/, "stream lua close fake stream connection", qr/go\(\): connected: 1, reused: \d+/, "go(): request sent: 11", -"go(): received: OK", +"go(): received: END", ] diff --git a/t/108-timer-safe.t b/t/108-timer-safe.t index 7cecb345..a1d9f5f2 100644 --- a/t/108-timer-safe.t +++ b/t/108-timer-safe.t @@ -261,7 +261,7 @@ function go(port) print("connected: ", ok, ", reused: ", sock:getreusedtimes()) - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -309,7 +309,7 @@ qr/\[lua\] .*? my lua timer handler/, "stream lua close fake stream connection", qr/go\(\): connected: 1, reused: \d+/, "go(): request sent: 11", -"go(): received: OK", +"go(): received: END", ] @@ -382,7 +382,7 @@ qr/\[lua\] content_by_lua\(nginx\.conf:\d+\):\d+: elapsed: 0(?:[^.]|\.00)/, print("connected: ", ok) - local req = "\0\1\0\0\0\1\0\0flush_all\r\n" + local req = "\0\1\0\0\0\1\0\0get __nil\r\n" local ok, err = udp:send(req) if not ok then fail("failed to send: ", err) @@ -429,7 +429,7 @@ qr/\[lua\] .*? my lua timer handler/, "lua ngx.timer expired", "stream lua close fake stream connection", "connected: 1", -"received 12 bytes: \x{00}\x{01}\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}OK\x{0d}\x{0a}" +"received 13 bytes: \x{00}\x{01}\x{00}\x{00}\x{00}\x{01}\x{00}\x{00}END\x{0d}\x{0a}" ] @@ -529,7 +529,7 @@ function go(port) print("connected: ", ok, ", reused: ", sock:getreusedtimes()) - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -576,7 +576,7 @@ qr/\[lua\] .*? my lua timer handler/, "stream lua close fake stream connection", qr/go\(\): connected: 1, reused: \d+/, "go(): request sent: 11", -"go(): received: OK", +"go(): received: END", ] diff --git a/t/124-init-worker.t b/t/124-init-worker.t index 7db58204..05a66d2e 100644 --- a/t/124-init-worker.t +++ b/t/124-init-worker.t @@ -120,7 +120,7 @@ warn(): timer expired (premature: false; counter: 0) return end - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -168,7 +168,7 @@ ok warn(): created timer: 1 warn(): timer expired (premature: false) warn(): request sent: 11 -warn(): received: OK +warn(): received: END --- log_level: debug --- error_log @@ -223,7 +223,7 @@ local function handler(premature) return end - local req = "flush_all\r\n" + local req = "get __nil\r\n" local bytes, err = sock:send(req) if not bytes then @@ -271,7 +271,7 @@ ok warn(): created timer: 1 warn(): timer expired (premature: false) warn(): request sent: 11 -warn(): received: OK +warn(): received: END --- log_level: debug --- error_log diff --git a/t/128-duplex-tcp-socket.t b/t/128-duplex-tcp-socket.t index d9ee08f6..f8384adb 100644 --- a/t/128-duplex-tcp-socket.t +++ b/t/128-duplex-tcp-socket.t @@ -33,7 +33,7 @@ __DATA__ ngx.say("connected: ", ok) - local req = "flush_all\r\nget foo\r\nget bar\r\n" + local req = "version\r\nget __nil\r\nget __nil\r\n" -- req = "OK" local send_idx = 1 @@ -77,12 +77,12 @@ __DATA__ --- config server_tokens off; ---- stream_response -connected: 1 -received: OK +--- stream_response_like +^connected: 1 +received: VERSION [^\r\n]+ received: END received: END -setkeepalive: 1 nil +setkeepalive: 1 nil$ --- no_error_log [error] @@ -104,7 +104,7 @@ setkeepalive: 1 nil ngx.say("connected: ", ok) - local req = "flush_all\r\n" + local req = "get __nil\r\n" -- req = "OK" local send_idx = 1 @@ -168,7 +168,7 @@ setkeepalive: 1 nil --- stream_response_like chop ^connected: 1 -(?:received: OK|failed to send request: timeout +(?:received: END|failed to send request: timeout partial read: ) read timed out: [1-9]\d* close: 1 nil$ @@ -472,7 +472,7 @@ close: nil closed local res, err = sock:receive(1) ngx.say("receive: ", res, " ", err) - local bytes, err = sock:send("flush_all") + local bytes, err = sock:send("get __nil") ngx.say("send: ", bytes, " ", err) local ok, err = sock:close() @@ -541,7 +541,7 @@ close: 1 nil local res, err = sock:receive(1) ngx.say("receive: ", res, " ", err) - local bytes, err = sock:send("flush_all") + local bytes, err = sock:send("get __nil") ngx.say("send: ", bytes, " ", err) local ok, err = sock:close() diff --git a/t/129-ssl-socket.t b/t/129-ssl-socket.t index 2b84087f..65cecb4a 100644 --- a/t/129-ssl-socket.t +++ b/t/129-ssl-socket.t @@ -18,7 +18,6 @@ if ($openssl_version =~ m/\bBoringSSL\b/) { $ENV{TEST_NGINX_HTML_DIR} ||= html_dir(); $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211; $ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8'; -$ENV{TEST_NGINX_SERVER_SSL_PORT} ||= 12345; $ENV{TEST_NGINX_CERT_DIR} ||= dirname(realpath(abs_path(__FILE__))); #log_level 'warn'; @@ -115,7 +114,7 @@ close: 1 nil --- grep_error_log eval: qr/lua ssl (?:set|save|free) session: [0-9A-F]+/ --- grep_error_log_out eval qr/^lua ssl save session: ([0-9A-F]+) -lua ssl free session: ([0-9A-F]+) +lua ssl free session: \1 $/ --- no_error_log lua ssl server name: @@ -129,7 +128,7 @@ SSL reused session === TEST 2: no SNI, no verify --- stream_config server { - listen $TEST_NGINX_SERVER_SSL_PORT ssl; + listen $TEST_NGINX_RAND_PORT_1 ssl; ssl_certificate ../html/test.crt; ssl_certificate_key ../html/test.key; @@ -147,7 +146,7 @@ SSL reused session do local sock = ngx.socket.tcp() sock:settimeout(2000) - local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_SERVER_SSL_PORT) + local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_RAND_PORT_1) if not ok then ngx.say("failed to connect: ", err) return @@ -2802,7 +2801,7 @@ Date: Tue Jan 28 00:53:15 2025 +0400 --- SKIP --- stream_config server { - listen $TEST_NGINX_SERVER_SSL_PORT ssl reuseport default_server; + listen $TEST_NGINX_RAND_PORT_1 ssl reuseport default_server; ssl_certificate ../../cert/test.crt; ssl_certificate_key ../../cert/test.key; ssl_session_cache builtin:1000; @@ -2829,7 +2828,7 @@ Date: Tue Jan 28 00:53:15 2025 +0400 } server { - listen $TEST_NGINX_SERVER_SSL_PORT ssl; + listen $TEST_NGINX_RAND_PORT_1 ssl; ssl_certificate ../../cert/test2.crt; ssl_certificate_key ../../cert/test2.key; ssl_session_cache builtin:1000; @@ -2867,7 +2866,7 @@ Date: Tue Jan 28 00:53:15 2025 +0400 for i = 1, 2 do local sock = ngx.socket.tcp() sock:settimeout(2000) - local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_SERVER_SSL_PORT) + local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_RAND_PORT_1) if not ok then ngx.say("failed to connect: ", err) return @@ -2944,7 +2943,7 @@ see TEST 35 env PATH; --- stream_config server { - listen $TEST_NGINX_SERVER_SSL_PORT ssl reuseport default_server; + listen $TEST_NGINX_RAND_PORT_1 ssl reuseport default_server; ssl_certificate ../../cert/test.crt; ssl_certificate_key ../../cert/test.key; ssl_session_cache builtin:1000; @@ -2971,7 +2970,7 @@ env PATH; } server { - listen $TEST_NGINX_SERVER_SSL_PORT ssl; + listen $TEST_NGINX_RAND_PORT_1 ssl; ssl_certificate ../../cert/test2.crt; ssl_certificate_key ../../cert/test2.key; ssl_session_cache builtin:1000; @@ -3006,12 +3005,12 @@ env PATH; content_by_lua_block { do -- openssl s_client -cert client_cert.pem -key client_key.pem -servername openresty.org -connect openresty.org:443 -sess_out sess.pem - -- ("127.0.0.1", $TEST_NGINX_SERVER_SSL_PORT) + -- ("127.0.0.1", $TEST_NGINX_RAND_PORT_1) -- server_name = "test.com" -- server_name = "test2.com" local prefix = ngx.config.prefix() - local cmd = [[bash -c "{ sleep 0.3; echo ping; } | /usr/bin/openssl s_client -cert %s/../cert/test.crt -key %s/../cert/test.key -servername test.com -connect 127.0.0.1:$TEST_NGINX_SERVER_SSL_PORT -sess_out sess.pem"]] + local cmd = [[bash -c "{ sleep 0.3; echo ping; } | /usr/bin/openssl s_client -cert %s/../cert/test.crt -key %s/../cert/test.key -servername test.com -connect 127.0.0.1:$TEST_NGINX_RAND_PORT_1 -sess_out sess.pem"]] cmd = string.format(cmd, prefix, prefix) local handle, err = io.popen(cmd) if not handle then @@ -3019,7 +3018,7 @@ env PATH; end ngx.sleep(0.2) - local cmd = [[/usr/bin/openssl s_client -cert %s/../cert/test.crt -key %s/../cert/test.key -servername test2.com -connect 127.0.0.1:$TEST_NGINX_SERVER_SSL_PORT -sess_in sess.pem]] + local cmd = [[/usr/bin/openssl s_client -cert %s/../cert/test.crt -key %s/../cert/test.key -servername test2.com -connect 127.0.0.1:$TEST_NGINX_RAND_PORT_1 -sess_in sess.pem]] cmd = string.format(cmd, prefix, prefix) local handle, err = io.popen(cmd) if not handle then diff --git a/t/139-ssl-cert-by.t b/t/139-ssl-cert-by.t index 95e86a64..760428d9 100644 --- a/t/139-ssl-cert-by.t +++ b/t/139-ssl-cert-by.t @@ -270,9 +270,9 @@ my timer run! return end - local bytes, err = sock:send("flush_all\r\n") + local bytes, err = sock:send("get __nil\r\n") if not bytes then - ngx.log(ngx.ERR, "failed to send flush_all command: ", err) + ngx.log(ngx.ERR, "failed to send get __nil command: ", err) return end @@ -338,7 +338,7 @@ close: 1 nil --- error_log lua ssl server name: "test.com" -received memc reply: OK +received memc reply: END --- no_error_log [error] diff --git a/t/154-semaphore.t b/t/154-semaphore.t index 81f2b183..187fc26b 100644 --- a/t/154-semaphore.t +++ b/t/154-semaphore.t @@ -117,13 +117,19 @@ ngx_http_lua_sema_handler would use the freed memory. ngx.log(ngx.INFO, "ngx.sem post start") sem:post() ngx.log(ngx.INFO, "ngx.sem post end") + ngx.say("hello") + local ok, err = ngx.flush(true) + if not ok then + ngx.log(ngx.ERR, "flush failed: ", err) + return + end ngx.exit(200) ngx.say("not reach here") } --- request GET /t ---- stream_response_like +--- stream_response hello --- grep_error_log eval: qr/(ngx.sem .*?,|close stream connection|semaphore handler: wait queue: empty, resource count: 1)/ --- grep_error_log_out diff --git a/t/162-ssl-client-hello-by.t b/t/162-ssl-client-hello-by.t index 8c6bcf62..29129a03 100644 --- a/t/162-ssl-client-hello-by.t +++ b/t/162-ssl-client-hello-by.t @@ -270,9 +270,9 @@ my timer run! return end - local bytes, err = sock:send("flush_all\r\n") + local bytes, err = sock:send("get __nil\r\n") if not bytes then - ngx.log(ngx.ERR, "failed to send flush_all command: ", err) + ngx.log(ngx.ERR, "failed to send get __nil command: ", err) return end @@ -338,7 +338,7 @@ close: 1 nil --- error_log lua ssl server name: "test.com" -received memc reply: OK +received memc reply: END --- no_error_log [error] @@ -1661,10 +1661,10 @@ client socket file: return end - local req = "\0\1\0\0\0\1\0\0flush_all\r\n" + local req = "\0\1\0\0\0\1\0\0get __nil\r\n" local ok, err = sock:send(req) if not ok then - ngx.log(ngx.ERR, "failed to send flush_all to memc: ", err) + ngx.log(ngx.ERR, "failed to send get __nil to memc: ", err) return end @@ -1720,13 +1720,13 @@ ssl handshake: userdata --- grep_error_log eval: qr/received memc reply of \d+ bytes/ --- grep_error_log_out eval [ -'received memc reply of 12 bytes +'received memc reply of 13 bytes ', -'received memc reply of 12 bytes +'received memc reply of 13 bytes ', -'received memc reply of 12 bytes +'received memc reply of 13 bytes ', -'received memc reply of 12 bytes +'received memc reply of 13 bytes ', ] diff --git a/t/164-proxy-ssl-verify-by.t b/t/164-proxy-ssl-verify-by.t index 8436b6bd..7c409023 100644 --- a/t/164-proxy-ssl-verify-by.t +++ b/t/164-proxy-ssl-verify-by.t @@ -900,17 +900,21 @@ proxy_ssl_verify_by_lua: handler return value: 0, cert verify callback exit code proxy_ssl_certificate_key ../../cert/mtls_client.key; proxy_ssl_trusted_certificate ../../cert/mtls_ca.crt; proxy_ssl_session_reuse off; - proxy_connect_timeout 100ms; + proxy_connect_timeout 1s; proxy_ssl_verify_by_lua_block { - ngx.sleep(0.2) + ngx.log(ngx.INFO, "proxy_ssl_verify_by_lua: callback started") + ngx.sleep(2) + ngx.log(ngx.INFO, "proxy_ssl_verify_by_lua: callback resumed") } ---- error_log +--- grep_error_log eval: qr/proxy_ssl_verify_by_lua: (?:callback started|cert verify callback aborted|callback resumed)/ +--- grep_error_log_out +proxy_ssl_verify_by_lua: callback started proxy_ssl_verify_by_lua: cert verify callback aborted --- no_error_log [error] [alert] ---- wait: 0.5 +--- wait: 2.1 diff --git a/t/165-proxy-ssl-cert-by.t b/t/165-proxy-ssl-cert-by.t index d8a56a6a..f5969cdc 100644 --- a/t/165-proxy-ssl-cert-by.t +++ b/t/165-proxy-ssl-cert-by.t @@ -846,17 +846,21 @@ proxy_ssl_certificate_by_lua: handler return value: 0, cert cb exit code: 1 proxy_ssl_certificate_key ../../cert/mtls_client.key; proxy_ssl_trusted_certificate ../../cert/mtls_ca.crt; proxy_ssl_session_reuse off; - proxy_connect_timeout 100ms; + proxy_connect_timeout 1s; proxy_ssl_certificate_by_lua_block { - ngx.sleep(0.2) + ngx.log(ngx.INFO, "proxy_ssl_certificate_by_lua: callback started") + ngx.sleep(2) + ngx.log(ngx.INFO, "proxy_ssl_certificate_by_lua: callback resumed") } ---- error_log +--- grep_error_log eval: qr/proxy_ssl_certificate_by_lua: (?:callback started|cert cb aborted|callback resumed)/ +--- grep_error_log_out +proxy_ssl_certificate_by_lua: callback started proxy_ssl_certificate_by_lua: cert cb aborted --- no_error_log [error] [alert] ---- wait: 0.5 +--- wait: 2.1 diff --git a/t/170-ssl-session-reuse.t b/t/170-ssl-session-reuse.t index 61286b3f..28fb338b 100644 --- a/t/170-ssl-session-reuse.t +++ b/t/170-ssl-session-reuse.t @@ -18,7 +18,6 @@ if ($openssl_version =~ m/\bBoringSSL\b/) { $ENV{TEST_NGINX_HTML_DIR} ||= html_dir(); $ENV{TEST_NGINX_MEMCACHED_PORT} ||= 11211; $ENV{TEST_NGINX_RESOLVER} ||= '8.8.8.8'; -$ENV{TEST_NGINX_SERVER_SSL_PORT} ||= 12345; $ENV{TEST_NGINX_CERT_DIR} ||= dirname(realpath(abs_path(__FILE__))); #log_level 'warn'; @@ -111,7 +110,7 @@ close: 1 nil === TEST 2: no SNI, no verify --- stream_config server { - listen $TEST_NGINX_SERVER_SSL_PORT ssl; + listen $TEST_NGINX_RAND_PORT_1 ssl; ssl_certificate ../html/test.crt; ssl_certificate_key ../html/test.key; @@ -131,7 +130,7 @@ close: 1 nil local ffi = require "ffi" local sock = ngx.socket.tcp() sock:settimeout(2000) - local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_SERVER_SSL_PORT) + local ok, err = sock:connect("127.0.0.1", $TEST_NGINX_RAND_PORT_1) if not ok then ngx.say("failed to connect: ", err) return