Skip to content

Commit d14139d

Browse files
committed
tests: fix CI configuration and SSL test issues
1 parent d34d3c5 commit d14139d

File tree

4 files changed

+28
-31
lines changed

4 files changed

+28
-31
lines changed

t/043-shdict.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ hello
158158
content_by_lua '
159159
local dogs = ngx.shared.dogs
160160
dogs:set("foo", 32, 0.01)
161-
ngx.location.capture("/sleep/0.01")
161+
ngx.location.capture("/sleep/0.011")
162162
ngx.say(dogs:get("foo"))
163163
';
164164
}
@@ -1131,7 +1131,7 @@ nil nil
11311131
content_by_lua '
11321132
local dogs = ngx.shared.dogs
11331133
dogs:set("foo", 32, 0.01, 255)
1134-
ngx.location.capture("/sleep/0.01")
1134+
ngx.location.capture("/sleep/0.011")
11351135
local res, flags = dogs:get("foo")
11361136
ngx.say("res = ", res, ", flags = ", flags)
11371137
';

t/140-ssl-c-api.t

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if ($openssl_version =~ m/built with OpenSSL (0|1\.0\.(?:0|1[^\d]|2[a-d]).*)/) {
1212
plan(skip_all => "too old OpenSSL, need 1.0.2e, was $1");
1313
} elsif ($openssl_version =~ m/BoringSSL/) {
1414
$ENV{TEST_NGINX_USE_BORINGSSL} = 1;
15-
plan tests => repeat_each() * (blocks() * 6 - 8);
15+
plan tests => repeat_each() * (blocks() * 6 - 6);
1616
} else {
1717
plan tests => repeat_each() * (blocks() * 5 - 5);
1818
$ENV{TEST_NGINX_USE_OPENSSL} = 1;
@@ -2074,7 +2074,3 @@ without_filter:\[.*\]
20742074
with_filter:\[.*\]
20752075
--- error_log chomp
20762076
TLSv1.2, cipher: "ECDHE-RSA-AES128-GCM-SHA256 TLSv1.2 Kx=ECDH Au=RSA Enc=AESGCM(128) Mac=AEAD"
2077-
2078-
2079-
2080-

t/142-ssl-session-store.t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,3 +975,4 @@ qr/ssl_session_store_by_lua\*: skipped since TLS version >= 1\.3 \(\d+\)/
975975
[error]
976976
[alert]
977977
[emerg]
978+
--- skip_eval: 6:$ENV{TEST_NGINX_USE_HTTP3}

util/run-ci.sh

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -67,30 +67,30 @@ function download_deps()
6767
wget -P download-cache https://github.com/openssl/openssl/releases/download/openssl-$OPENSSL_VER/openssl-$OPENSSL_VER.tar.gz
6868
fi
6969

70-
git_download clone https://github.com/openresty/test-nginx.git
71-
git_download clone https://github.com/openresty/openresty.git ../openresty
72-
git_download clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx
73-
git_download clone https://github.com/openresty/openresty-devel-utils.git
74-
git_download clone https://github.com/openresty/mockeagain.git
75-
git_download clone https://github.com/openresty/lua-cjson.git lua-cjson
76-
git_download clone https://github.com/openresty/lua-upstream-nginx-module.git ../lua-upstream-nginx-module
77-
git_download clone https://github.com/openresty/echo-nginx-module.git ../echo-nginx-module
78-
git_download clone https://github.com/openresty/nginx-eval-module.git ../nginx-eval-module
79-
git_download clone https://github.com/simpl/ngx_devel_kit.git ../ndk-nginx-module
80-
git_download clone https://github.com/FRiCKLE/ngx_coolkit.git ../coolkit-nginx-module
81-
git_download clone https://github.com/openresty/headers-more-nginx-module.git ../headers-more-nginx-module
82-
git_download clone https://github.com/openresty/drizzle-nginx-module.git ../drizzle-nginx-module
83-
git_download clone https://github.com/openresty/set-misc-nginx-module.git ../set-misc-nginx-module
84-
git_download clone https://github.com/openresty/memc-nginx-module.git ../memc-nginx-module
85-
git_download clone https://github.com/openresty/rds-json-nginx-module.git ../rds-json-nginx-module
86-
git_download clone https://github.com/openresty/srcache-nginx-module.git ../srcache-nginx-module
87-
git_download clone https://github.com/openresty/redis2-nginx-module.git ../redis2-nginx-module
88-
git_download clone https://github.com/openresty/lua-resty-core.git ../lua-resty-core
89-
git_download clone https://github.com/openresty/lua-resty-lrucache.git ../lua-resty-lrucache
90-
git_download clone https://github.com/openresty/lua-resty-mysql.git ../lua-resty-mysql
91-
git_download clone https://github.com/openresty/lua-resty-string.git ../lua-resty-string
92-
git_download clone https://github.com/openresty/stream-lua-nginx-module.git ../stream-lua-nginx-module
93-
git_download clone -b v2.1-agentzh https://github.com/openresty/luajit2.git luajit2
70+
git_download https://github.com/openresty/test-nginx.git
71+
git_download https://github.com/openresty/openresty.git ../openresty
72+
git_download https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx
73+
git_download https://github.com/openresty/openresty-devel-utils.git
74+
git_download https://github.com/openresty/mockeagain.git
75+
git_download https://github.com/openresty/lua-cjson.git lua-cjson
76+
git_download https://github.com/openresty/lua-upstream-nginx-module.git ../lua-upstream-nginx-module
77+
git_download https://github.com/openresty/echo-nginx-module.git ../echo-nginx-module
78+
git_download https://github.com/openresty/nginx-eval-module.git ../nginx-eval-module
79+
git_download https://github.com/simpl/ngx_devel_kit.git ../ndk-nginx-module
80+
git_download https://github.com/FRiCKLE/ngx_coolkit.git ../coolkit-nginx-module
81+
git_download https://github.com/openresty/headers-more-nginx-module.git ../headers-more-nginx-module
82+
git_download https://github.com/openresty/drizzle-nginx-module.git ../drizzle-nginx-module
83+
git_download https://github.com/openresty/set-misc-nginx-module.git ../set-misc-nginx-module
84+
git_download https://github.com/openresty/memc-nginx-module.git ../memc-nginx-module
85+
git_download https://github.com/openresty/rds-json-nginx-module.git ../rds-json-nginx-module
86+
git_download https://github.com/openresty/srcache-nginx-module.git ../srcache-nginx-module
87+
git_download https://github.com/openresty/redis2-nginx-module.git ../redis2-nginx-module
88+
git_download https://github.com/openresty/lua-resty-core.git ../lua-resty-core
89+
git_download https://github.com/openresty/lua-resty-lrucache.git ../lua-resty-lrucache
90+
git_download https://github.com/openresty/lua-resty-mysql.git ../lua-resty-mysql
91+
git_download https://github.com/openresty/lua-resty-string.git ../lua-resty-string
92+
git_download https://github.com/openresty/stream-lua-nginx-module.git ../stream-lua-nginx-module
93+
git_download -b v2.1-agentzh https://github.com/openresty/luajit2.git luajit2
9494
}
9595

9696
function make_deps()

0 commit comments

Comments
 (0)