Skip to content

Commit

Permalink
chore: reenable all http2 test
Browse files Browse the repository at this point in the history
  • Loading branch information
oowl committed Oct 24, 2024
1 parent 0abcb20 commit 877cd6a
Show file tree
Hide file tree
Showing 16 changed files with 42 additions and 44 deletions.
2 changes: 2 additions & 0 deletions t/005-exit.t
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ GET /api?user=agentz

=== TEST 6: working with ngx_auth_request (simplest form, w/o ngx_memc)
--- skip_eval: 3:$ENV{TEST_NGINX_USE_HTTP3}
--- no_http2
--- http_config eval
"
lua_package_cpath '$::LuaCpath';
Expand Down Expand Up @@ -197,6 +198,7 @@ Logged in 56

=== TEST 7: working with ngx_auth_request (simplest form)
--- skip_eval: 3:$ENV{TEST_NGINX_USE_HTTP3}
--- no_http2
--- http_config eval
"
lua_package_cpath '$::LuaCpath';
Expand Down
2 changes: 1 addition & 1 deletion t/014-bugs.t
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ https://datatracker.ietf.org/doc/html/rfc7540#section-8.1.2
header field names MUST be converted to lowercase prior to their
encoding in HTTP/2. A request or response containing uppercase
header field names MUST be treated as malformed

--- no_http2
--- config
location /sub {
content_by_lua '
Expand Down
1 change: 1 addition & 0 deletions t/016-resp-header.t
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@ Fooy: cony1, cony2


=== TEST 15: set header after ngx.print
--- no_http2
--- config
location /lua {
default_type "text/plain";
Expand Down
1 change: 1 addition & 0 deletions t/020-subrequest.t
Original file line number Diff line number Diff line change
Expand Up @@ -1198,6 +1198,7 @@ body:


=== TEST 43: subrequests with an output body filter returning NGX_ERROR
--- no_http2
--- config
location /sub {
echo hello world;
Expand Down
3 changes: 3 additions & 0 deletions t/023-rewrite/exit.t
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ GET /api?user=agentz


=== TEST 6: working with ngx_auth_request (simplest form, w/o ngx_memc)
--- no_http2
--- http_config eval
"
lua_package_cpath '$::LuaCpath';
Expand Down Expand Up @@ -192,6 +193,7 @@ Logged in 56


=== TEST 7: working with ngx_auth_request (simplest form)
--- no_http2
--- http_config eval
"
lua_package_cpath '$::LuaCpath';
Expand Down Expand Up @@ -264,6 +266,7 @@ Logged in 56


=== TEST 8: working with ngx_auth_request
--- no_http2
--- http_config eval
"
lua_package_cpath '$::LuaCpath';
Expand Down
3 changes: 3 additions & 0 deletions t/024-access/exit.t
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ GET /api?user=agentz


=== TEST 6: working with ngx_auth_request (simplest form, w/o ngx_memc)
--- no_http2
--- http_config eval
"
lua_package_cpath '$::LuaCpath';
Expand Down Expand Up @@ -182,6 +183,7 @@ Logged in 56


=== TEST 7: working with ngx_auth_request (simplest form)
--- no_http2
--- http_config eval
"
lua_package_cpath '$::LuaCpath';
Expand Down Expand Up @@ -249,6 +251,7 @@ Logged in 56


=== TEST 8: working with ngx_auth_request
--- no_http2
--- http_config eval
"
lua_package_cpath '$::LuaCpath';
Expand Down
1 change: 1 addition & 0 deletions t/026-mysql.t
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ run_tests();
__DATA__

=== TEST 1: when mysql query timed out, kill that query by Lua
--- no_http2
--- http_config
upstream backend {
drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
Expand Down
2 changes: 1 addition & 1 deletion t/033-ctx.t
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ GET /t
--- error_log
ngx.ctx = 32
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand Down
38 changes: 19 additions & 19 deletions t/041-header-filter.t
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ GET /read
--- error_code
--- response_body
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand Down Expand Up @@ -468,7 +468,7 @@ failed to run header_filter_by_lua*: header_filter_by_lua(nginx.conf:47):2: Some
--- no_error_log
[alert]
--- curl_error eval
qr/curl: \(56\) Failure when receiving data from the peer|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(52\) Empty reply from server|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(56\) Failure when receiving data from the peer|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(52\) Empty reply from server|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand All @@ -492,7 +492,7 @@ failed to run header_filter_by_lua*: unknown reason
--- no_error_log
[alert]
--- curl_error eval
qr/curl: \(56\) Failure when receiving data from the peer|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(52\) Empty reply from server|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(56\) Failure when receiving data from the peer|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(52\) Empty reply from server|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand All @@ -508,7 +508,7 @@ GET /lua
--- error_log
API disabled in the context of header_filter_by_lua*
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand All @@ -524,7 +524,7 @@ GET /lua
--- error_log
API disabled in the context of header_filter_by_lua*
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand All @@ -540,7 +540,7 @@ GET /lua
--- error_log
API disabled in the context of header_filter_by_lua*
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand All @@ -556,7 +556,7 @@ GET /lua
--- error_log
API disabled in the context of header_filter_by_lua*
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand All @@ -572,7 +572,7 @@ GET /lua
--- error_log
API disabled in the context of header_filter_by_lua*
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand All @@ -592,7 +592,7 @@ GET /lua
--- error_log
API disabled in the context of header_filter_by_lua*
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand All @@ -612,7 +612,7 @@ GET /lua
--- error_log
API disabled in the context of header_filter_by_lua*
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand All @@ -628,7 +628,7 @@ GET /lua
--- error_log
API disabled in the context of header_filter_by_lua*
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand All @@ -644,7 +644,7 @@ GET /lua
--- error_log
API disabled in the context of header_filter_by_lua*
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand All @@ -660,7 +660,7 @@ GET /lua
--- error_log
API disabled in the context of header_filter_by_lua*
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand Down Expand Up @@ -694,7 +694,7 @@ GET /lua
--- error_log eval
qr/API disabled in the context of header_filter_by_lua\*|http3 requests are not supported without content-length header/ms
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand All @@ -718,7 +718,7 @@ if (defined $ENV{TEST_NGINX_USE_HTTP3}) {

$err_log;
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand All @@ -734,7 +734,7 @@ GET /lua
--- error_log
API disabled in the context of header_filter_by_lua*
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand All @@ -750,7 +750,7 @@ GET /lua
--- error_log
API disabled in the context of header_filter_by_lua*
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand Down Expand Up @@ -799,7 +799,7 @@ in function 'error'
in function 'bar'
in function 'foo'
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand All @@ -819,7 +819,7 @@ GET /lua?a=1&b=2
--- error_log eval
qr/failed to load external Lua file ".*?test2\.lua": cannot open .*? No such file or directory/
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand Down
1 change: 1 addition & 0 deletions t/068-socket-keepalive.t
Original file line number Diff line number Diff line change
Expand Up @@ -1384,6 +1384,7 @@ bad argument #3 to 'connect' (bad "pool" option type: boolean)


=== TEST 23: clear the redis store
--- no_http2
--- config
location /t {
redis2_query flushall;
Expand Down
5 changes: 3 additions & 2 deletions t/091-coroutine.t
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ GET /lua
--- error_log
API disabled in the context of header_filter_by_lua*
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand Down Expand Up @@ -1423,6 +1423,7 @@ GET /t


=== TEST 35: coroutine.wrap runtime errors do not log errors
--- no_http2
--- config
location = /t {
content_by_lua_block {
Expand Down Expand Up @@ -1700,7 +1701,7 @@ GET /t
"in function 'co'"
]
--- curl_error eval
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 0 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/
qr/curl: \(52\) Empty reply from server|curl: \(92\) HTTP\/2 stream 1 was not closed cleanly|curl: \(95\) HTTP\/3 stream 0 reset by server/



Expand Down
3 changes: 3 additions & 0 deletions t/094-uthread-exit.t
Original file line number Diff line number Diff line change
Expand Up @@ -1313,6 +1313,7 @@ attempt to abort with pending subrequests


=== TEST 16: exit in entry thread (user thread is still pending on ngx.location.capture_multi), without pending output
--- no_http2
--- config
location /lua {
client_body_timeout 12000ms;
Expand Down Expand Up @@ -1407,6 +1408,7 @@ qr#curl: \(52\) Empty reply from server|curl: \(95\) HTTP/3 stream 0 reset by se


=== TEST 17: exit(444) in user thread (entry thread is still pending on ngx.location.capture), with pending output
--- no_http2
--- config
location /lua {
client_body_timeout 12000ms;
Expand Down Expand Up @@ -1492,6 +1494,7 @@ qr#curl: \(52\) Empty reply from server|curl: \(95\) HTTP/3 stream 0 reset by se


=== TEST 18: exit(408) in user thread (entry thread is still pending on ngx.location.capture), with pending output
--- no_http2
--- config
location /lua {
client_body_timeout 12000ms;
Expand Down
1 change: 1 addition & 0 deletions t/095-uthread-exec.t
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ attempt to abort with pending subrequests


=== TEST 6: exec in entry thread (user thread is still pending on ngx.location.capture), without pending output
--- no_http2
--- config
location /lua {
client_body_timeout 12000ms;
Expand Down
1 change: 1 addition & 0 deletions t/096-uthread-redirect.t
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ free request


=== TEST 3: ngx.redirect() in entry thread (user thread is still pending on ngx.location.capture_multi), without pending output
--- no_http2
--- config
location /lua {
client_body_timeout 12000ms;
Expand Down
Loading

0 comments on commit 877cd6a

Please sign in to comment.