From d14139df77e54e91a8f0e7ba95a55b6af65830f1 Mon Sep 17 00:00:00 2001 From: swananan Date: Sun, 27 Jul 2025 21:34:00 +0800 Subject: [PATCH] tests: fix CI configuration and SSL test issues --- t/043-shdict.t | 4 ++-- t/140-ssl-c-api.t | 6 +---- t/142-ssl-session-store.t | 1 + util/run-ci.sh | 48 +++++++++++++++++++-------------------- 4 files changed, 28 insertions(+), 31 deletions(-) diff --git a/t/043-shdict.t b/t/043-shdict.t index 649683b9fe..3c0cc7961a 100644 --- a/t/043-shdict.t +++ b/t/043-shdict.t @@ -158,7 +158,7 @@ hello content_by_lua ' local dogs = ngx.shared.dogs dogs:set("foo", 32, 0.01) - ngx.location.capture("/sleep/0.01") + ngx.location.capture("/sleep/0.011") ngx.say(dogs:get("foo")) '; } @@ -1131,7 +1131,7 @@ nil nil content_by_lua ' local dogs = ngx.shared.dogs dogs:set("foo", 32, 0.01, 255) - ngx.location.capture("/sleep/0.01") + ngx.location.capture("/sleep/0.011") local res, flags = dogs:get("foo") ngx.say("res = ", res, ", flags = ", flags) '; diff --git a/t/140-ssl-c-api.t b/t/140-ssl-c-api.t index 15ed8abfcf..ca04a87528 100644 --- a/t/140-ssl-c-api.t +++ b/t/140-ssl-c-api.t @@ -12,7 +12,7 @@ if ($openssl_version =~ m/built with OpenSSL (0|1\.0\.(?:0|1[^\d]|2[a-d]).*)/) { plan(skip_all => "too old OpenSSL, need 1.0.2e, was $1"); } elsif ($openssl_version =~ m/BoringSSL/) { $ENV{TEST_NGINX_USE_BORINGSSL} = 1; - plan tests => repeat_each() * (blocks() * 6 - 8); + plan tests => repeat_each() * (blocks() * 6 - 6); } else { plan tests => repeat_each() * (blocks() * 5 - 5); $ENV{TEST_NGINX_USE_OPENSSL} = 1; @@ -2074,7 +2074,3 @@ without_filter:\[.*\] with_filter:\[.*\] --- error_log chomp TLSv1.2, cipher: "ECDHE-RSA-AES128-GCM-SHA256 TLSv1.2 Kx=ECDH Au=RSA Enc=AESGCM(128) Mac=AEAD" - - - - diff --git a/t/142-ssl-session-store.t b/t/142-ssl-session-store.t index ead2a167e5..11deb83207 100644 --- a/t/142-ssl-session-store.t +++ b/t/142-ssl-session-store.t @@ -975,3 +975,4 @@ qr/ssl_session_store_by_lua\*: skipped since TLS version >= 1\.3 \(\d+\)/ [error] [alert] [emerg] +--- skip_eval: 6:$ENV{TEST_NGINX_USE_HTTP3} diff --git a/util/run-ci.sh b/util/run-ci.sh index b5e5407c17..bb23926165 100755 --- a/util/run-ci.sh +++ b/util/run-ci.sh @@ -67,30 +67,30 @@ function download_deps() wget -P download-cache https://github.com/openssl/openssl/releases/download/openssl-$OPENSSL_VER/openssl-$OPENSSL_VER.tar.gz fi - git_download clone https://github.com/openresty/test-nginx.git - git_download clone https://github.com/openresty/openresty.git ../openresty - git_download clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx - git_download clone https://github.com/openresty/openresty-devel-utils.git - git_download clone https://github.com/openresty/mockeagain.git - git_download clone https://github.com/openresty/lua-cjson.git lua-cjson - git_download clone https://github.com/openresty/lua-upstream-nginx-module.git ../lua-upstream-nginx-module - git_download clone https://github.com/openresty/echo-nginx-module.git ../echo-nginx-module - git_download clone https://github.com/openresty/nginx-eval-module.git ../nginx-eval-module - git_download clone https://github.com/simpl/ngx_devel_kit.git ../ndk-nginx-module - git_download clone https://github.com/FRiCKLE/ngx_coolkit.git ../coolkit-nginx-module - git_download clone https://github.com/openresty/headers-more-nginx-module.git ../headers-more-nginx-module - git_download clone https://github.com/openresty/drizzle-nginx-module.git ../drizzle-nginx-module - git_download clone https://github.com/openresty/set-misc-nginx-module.git ../set-misc-nginx-module - git_download clone https://github.com/openresty/memc-nginx-module.git ../memc-nginx-module - git_download clone https://github.com/openresty/rds-json-nginx-module.git ../rds-json-nginx-module - git_download clone https://github.com/openresty/srcache-nginx-module.git ../srcache-nginx-module - git_download clone https://github.com/openresty/redis2-nginx-module.git ../redis2-nginx-module - git_download clone https://github.com/openresty/lua-resty-core.git ../lua-resty-core - git_download clone https://github.com/openresty/lua-resty-lrucache.git ../lua-resty-lrucache - git_download clone https://github.com/openresty/lua-resty-mysql.git ../lua-resty-mysql - git_download clone https://github.com/openresty/lua-resty-string.git ../lua-resty-string - git_download clone https://github.com/openresty/stream-lua-nginx-module.git ../stream-lua-nginx-module - git_download clone -b v2.1-agentzh https://github.com/openresty/luajit2.git luajit2 + git_download https://github.com/openresty/test-nginx.git + git_download https://github.com/openresty/openresty.git ../openresty + git_download https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx + git_download https://github.com/openresty/openresty-devel-utils.git + git_download https://github.com/openresty/mockeagain.git + git_download https://github.com/openresty/lua-cjson.git lua-cjson + git_download https://github.com/openresty/lua-upstream-nginx-module.git ../lua-upstream-nginx-module + git_download https://github.com/openresty/echo-nginx-module.git ../echo-nginx-module + git_download https://github.com/openresty/nginx-eval-module.git ../nginx-eval-module + git_download https://github.com/simpl/ngx_devel_kit.git ../ndk-nginx-module + git_download https://github.com/FRiCKLE/ngx_coolkit.git ../coolkit-nginx-module + git_download https://github.com/openresty/headers-more-nginx-module.git ../headers-more-nginx-module + git_download https://github.com/openresty/drizzle-nginx-module.git ../drizzle-nginx-module + git_download https://github.com/openresty/set-misc-nginx-module.git ../set-misc-nginx-module + git_download https://github.com/openresty/memc-nginx-module.git ../memc-nginx-module + git_download https://github.com/openresty/rds-json-nginx-module.git ../rds-json-nginx-module + git_download https://github.com/openresty/srcache-nginx-module.git ../srcache-nginx-module + git_download https://github.com/openresty/redis2-nginx-module.git ../redis2-nginx-module + git_download https://github.com/openresty/lua-resty-core.git ../lua-resty-core + git_download https://github.com/openresty/lua-resty-lrucache.git ../lua-resty-lrucache + git_download https://github.com/openresty/lua-resty-mysql.git ../lua-resty-mysql + git_download https://github.com/openresty/lua-resty-string.git ../lua-resty-string + git_download https://github.com/openresty/stream-lua-nginx-module.git ../stream-lua-nginx-module + git_download -b v2.1-agentzh https://github.com/openresty/luajit2.git luajit2 } function make_deps()