Skip to content

Commit b21832c

Browse files
zhuizhuhaomengzhuizhuhaomeng
authored
tests: bumped nginx to 1.29.8.
1 parent a120ed9 commit b21832c

5 files changed

Lines changed: 59 additions & 7 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ env:
5151
- TEST_NGINX_RANDOMIZE=1
5252
- LUACHECK_VER=0.21.1
5353
matrix:
54-
- NGINX_VERSION=1.29.4 OPENSSL_VER=3.5.4 OPENSSL_PATCH_VER=3.5.4
54+
- NGINX_VERSION=1.29.8 OPENSSL_VER=3.5.6 OPENSSL_PATCH_VER=3.5.5
5555

5656
services:
5757
- memcache

‎t/balancer-keepalive-localaddr.t‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ __DATA__
9696
--- http_upstream
9797
upstream test_upstream {
9898
server 0.0.0.1;
99+
keepalive 0;
99100
100101
balancer_by_lua_block {
101102
local b = require "ngx.balancer"
@@ -145,6 +146,7 @@ $/
145146
--- http_upstream
146147
upstream test_upstream {
147148
server 0.0.0.1;
149+
keepalive 0;
148150
149151
balancer_by_lua_block {
150152
local b = require "ngx.balancer"
@@ -198,6 +200,7 @@ $/
198200
--- http_upstream
199201
upstream test_upstream {
200202
server 0.0.0.1;
203+
keepalive 0;
201204
202205
balancer_by_lua_block {
203206
local b = require "ngx.balancer"
@@ -248,6 +251,7 @@ $/
248251
--- http_upstream
249252
upstream test_upstream {
250253
server 0.0.0.1;
254+
keepalive 0;
251255
252256
balancer_by_lua_block {
253257
local b = require "ngx.balancer"
@@ -306,6 +310,7 @@ $/
306310
--- http_upstream
307311
upstream test_upstream {
308312
server 0.0.0.1;
313+
keepalive 0;
309314
310315
balancer_by_lua_block {
311316
local b = require "ngx.balancer"
@@ -355,6 +360,7 @@ $/
355360
--- http_upstream
356361
upstream test_upstream {
357362
server 0.0.0.1;
363+
keepalive 0;
358364
359365
balancer_by_lua_block {
360366
local b = require "ngx.balancer"
@@ -404,6 +410,7 @@ $/
404410
--- http_upstream
405411
upstream test_upstream {
406412
server 0.0.0.1;
413+
keepalive 0;
407414
408415
balancer_by_lua_block {
409416
local b = require "ngx.balancer"

‎t/balancer-keepalive.t‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ SNI=one
139139
--- http_upstream
140140
upstream test_upstream {
141141
server 0.0.0.1;
142+
keepalive 0;
142143
143144
balancer_by_lua_block {
144145
local b = require "ngx.balancer"
@@ -192,6 +193,7 @@ lua balancer: keepalive saving connection \S+, host: 127.0.0.2:$ENV{TEST_NGINX_S
192193
=== TEST 3: enable_keepalive: sanity(same ip port with different sni)
193194
--- http_upstream
194195
upstream test_upstream {
196+
keepalive 0;
195197
server 0.0.0.1;
196198
197199
balancer_by_lua_block {
@@ -238,6 +240,7 @@ lua balancer: keepalive saving connection \S+, host: 127.0.0.1:$ENV{TEST_NGINX_S
238240
--- http_upstream
239241
upstream test_upstream {
240242
server 0.0.0.1;
243+
keepalive 0;
241244
242245
balancer_by_lua_block {
243246
local b = require "ngx.balancer"
@@ -292,6 +295,7 @@ lua balancer: keepalive saving connection \S+, host: 127.0.0.2:$ENV{TEST_NGINX_S
292295
--- http_upstream
293296
upstream test_upstream {
294297
server 0.0.0.1;
298+
keepalive 0;
295299
296300
balancer_by_lua_block {
297301
local b = require "ngx.balancer"
@@ -390,6 +394,7 @@ ssl_client_s_dn=.*?CN=test\.com.*? ssl_protocol=TLSv1\.3
390394
--- http_upstream
391395
upstream test_upstream {
392396
server 0.0.0.1;
397+
keepalive 0;
393398
394399
balancer_by_lua_block {
395400
local b = require "ngx.balancer"
@@ -550,6 +555,7 @@ no upstream found
550555
=== TEST 11: enable_keepalive: bad usage (bad context)
551556
--- http_upstream
552557
upstream test_upstream {
558+
keepalive 0;
553559
server 127.0.0.1:$TEST_NGINX_SERVER_SSL_PORT;
554560
}
555561
--- config
@@ -576,6 +582,7 @@ API disabled in the current context
576582
--- http_upstream
577583
upstream test_upstream {
578584
server 0.0.0.1;
585+
keepalive 0;
579586
580587
balancer_by_lua_block {
581588
local b = require "ngx.balancer"
@@ -654,6 +661,7 @@ bad argument #2 to 'enable_keepalive' (expected >= 0)
654661
--- http_upstream
655662
upstream test_upstream {
656663
server 0.0.0.1;
664+
keepalive 0;
657665
658666
balancer_by_lua_block {
659667
local b = require "ngx.balancer"
@@ -697,6 +705,7 @@ lua balancer: keepalive saving connection \S+, host: 127.0.0.1:$ENV{TEST_NGINX_S
697705
--- http_upstream
698706
upstream test_upstream {
699707
server 0.0.0.1;
708+
keepalive 0;
700709
701710
balancer_by_lua_block {
702711
local b = require "ngx.balancer"
@@ -738,6 +747,7 @@ lua balancer: keepalive not saving connection \S+
738747
--- http_upstream
739748
upstream test_upstream {
740749
server 0.0.0.1;
750+
keepalive 0;
741751
742752
balancer_by_lua_block {
743753
local b = require "ngx.balancer"
@@ -773,6 +783,7 @@ lua balancer: keepalive not saving connection \S+
773783
--- http_upstream
774784
upstream test_upstream {
775785
server 0.0.0.1;
786+
keepalive 0;
776787
777788
balancer_by_lua_block {
778789
local b = require "ngx.balancer"
@@ -812,6 +823,7 @@ lua balancer: keepalive closing connection \S+$/
812823
--- http_upstream
813824
upstream test_upstream {
814825
server 0.0.0.1;
826+
keepalive 0;
815827
balancer_keepalive 2;
816828
balancer_by_lua_block {
817829
local b = require "ngx.balancer"
@@ -862,6 +874,7 @@ lua balancer: keepalive saving connection \S+, host: 127.0.0.1:$ENV{TEST_NGINX_S
862874
--- http_upstream
863875
upstream test_upstream {
864876
server 0.0.0.1;
877+
keepalive 0;
865878
866879
balancer_by_lua_block {
867880
local b = require "ngx.balancer"
@@ -901,6 +914,7 @@ $/
901914
--- http_upstream
902915
upstream test_upstream {
903916
server 0.0.0.1;
917+
keepalive 0;
904918
905919
balancer_by_lua_block {
906920
local b = require "ngx.balancer"
@@ -937,6 +951,7 @@ $/
937951
--- http_upstream
938952
upstream test_upstream {
939953
server 0.0.0.1;
954+
keepalive 0;
940955
941956
balancer_by_lua_block {
942957
local b = require "ngx.balancer"
@@ -972,6 +987,7 @@ lua balancer: keepalive not saving connection \S+$/
972987
--- http_upstream
973988
upstream test_upstream {
974989
server 0.0.0.1;
990+
keepalive 0;
975991
976992
balancer_by_lua_block {
977993
local b = require "ngx.balancer"
@@ -1013,6 +1029,7 @@ lua balancer: keepalive not saving connection \S+$/
10131029
--- http_upstream
10141030
upstream test_upstream {
10151031
server 0.0.0.1;
1032+
keepalive 0;
10161033
10171034
balancer_by_lua_block {
10181035
local b = require "ngx.balancer"
@@ -1072,6 +1089,7 @@ lua balancer: keepalive saving connection \S+, host: 127.0.0.1:$ENV{TEST_NGINX_S
10721089
--- http_upstream
10731090
upstream test_upstream {
10741091
server 0.0.0.1;
1092+
keepalive 0;
10751093
10761094
balancer_by_lua_block {
10771095
local b = require "ngx.balancer"
@@ -1180,7 +1198,6 @@ empty, as peers always get saved by the Lua pooling.
11801198
--- http_upstream
11811199
upstream test_upstream {
11821200
server 0.0.0.1;
1183-
11841201
balancer_by_lua_block {
11851202
local b = require "ngx.balancer"
11861203
@@ -1227,6 +1244,7 @@ lua balancer: keepalive not saving connection \S+$/
12271244
--- http_upstream
12281245
upstream test_upstream {
12291246
server 0.0.0.1;
1247+
keepalive 0;
12301248
12311249
balancer_by_lua_block {
12321250
local b = require "ngx.balancer"

‎t/balancer-timeout.t‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ __DATA__
4747
4848
upstream backend {
4949
server 0.0.0.1;
50+
keepalive 0;
5051
balancer_by_lua_block {
5152
local b = require "ngx.balancer"
5253
assert(b.set_timeouts(1.234, 5.678, 7.689))
@@ -82,6 +83,7 @@ event timer add: \d+: 7689:
8283
8384
upstream backend {
8485
server 0.0.0.1;
86+
keepalive 0;
8587
balancer_by_lua_block {
8688
local b = require "ngx.balancer"
8789
assert(b.set_timeouts(nil, 5.678, 7.689))
@@ -117,6 +119,7 @@ event timer add: \d+: 7689:
117119
118120
upstream backend {
119121
server 0.0.0.1;
122+
keepalive 0;
120123
balancer_by_lua_block {
121124
local b = require "ngx.balancer"
122125
assert(b.set_timeouts(1.234, nil, 7.689))
@@ -152,6 +155,7 @@ event timer add: \d+: 7689:
152155
153156
upstream backend {
154157
server 0.0.0.1;
158+
keepalive 0;
155159
balancer_by_lua_block {
156160
local b = require "ngx.balancer"
157161
assert(b.set_timeouts(1.234, 5.678, nil))
@@ -186,6 +190,7 @@ event timer add: \d+: 7689:
186190
187191
upstream backend {
188192
server 0.0.0.1;
193+
keepalive 0;
189194
balancer_by_lua_block {
190195
print("hello from balancer by lua!")
191196
local b = require "ngx.balancer"
@@ -217,6 +222,7 @@ qr/\[error\] .*? balancer_by_lua\(nginx.conf:\d+\):4: bad connect timeout/
217222
218223
upstream backend {
219224
server 0.0.0.1;
225+
keepalive 0;
220226
balancer_by_lua_block {
221227
print("hello from balancer by lua!")
222228
local b = require "ngx.balancer"
@@ -248,6 +254,7 @@ qr/\[error\] .*? balancer_by_lua\(nginx.conf:\d+\):4: bad connect timeout/
248254
249255
upstream backend {
250256
server 0.0.0.1;
257+
keepalive 0;
251258
balancer_by_lua_block {
252259
print("hello from balancer by lua!")
253260
local b = require "ngx.balancer"
@@ -279,6 +286,7 @@ qr/\[error\] .*? balancer_by_lua\(nginx.conf:\d+\):4: bad send timeout/
279286
280287
upstream backend {
281288
server 0.0.0.1;
289+
keepalive 0;
282290
balancer_by_lua_block {
283291
print("hello from balancer by lua!")
284292
local b = require "ngx.balancer"
@@ -310,6 +318,7 @@ qr/\[error\] .*? balancer_by_lua\(nginx.conf:\d+\):4: bad send timeout/
310318
311319
upstream backend {
312320
server 0.0.0.1;
321+
keepalive 0;
313322
balancer_by_lua_block {
314323
print("hello from balancer by lua!")
315324
local b = require "ngx.balancer"
@@ -369,6 +378,7 @@ failed to call: no upstream found
369378
370379
upstream backend {
371380
server 0.0.0.1;
381+
keepalive 0;
372382
balancer_by_lua_block {
373383
local balancer = require "ngx.balancer"
374384
local ok, err = balancer.set_timeouts("1.234", 1, 1)

0 commit comments

Comments
 (0)