Skip to content

Commit 24307c5

Browse files
author
jiahao
committed
updated ci for stream >= 1.25.5.
1 parent be92465 commit 24307c5

File tree

6 files changed

+45
-3
lines changed

6 files changed

+45
-3
lines changed

t/023-preread/client-abort.t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,7 @@ delete thread 1
334334
[error]
335335
--- error_log
336336
client prematurely closed connection
337+
--- skip_nginx: 4: >= 1.25.5
337338
338339
339340

t/023-preread/req-socket.t

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@ finalize stream session: 200
391391
--- no_error_log
392392
[warn]
393393
[error]
394+
--- skip_nginx: 5: >= 1.25.5
394395

395396

396397

@@ -509,6 +510,7 @@ received: hello world
509510
attempt to peek on a consumed socket
510511
--- no_error_log
511512
[warn]
513+
--- skip_nginx: 4: >= 1.25.5
512514

513515

514516

@@ -568,3 +570,4 @@ $ssl_preread_server_name = my.sni.server.name while prereading client data
568570
[warn]
569571
assertion failed!
570572
lua entry thread aborted
573+
--- skip_nginx: 8: >= 1.25.5

t/023-preread/sanity.t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ $ssl_preread_server_name = my.sni.server.name while prereading client data
199199
--- no_error_log
200200
[crit]
201201
[warn]
202+
--- skip_nginx: 5: >= 1.25.5
202203
203204
204205

t/023-preread/socket-keepalive.t

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
# vim:set ft= ts=4 sw=4 et fdm=marker:
22

3-
use Test::Nginx::Socket::Lua::Stream;
3+
our $SkipReason;
4+
5+
BEGIN {
6+
use Test::Nginx::Util;
7+
8+
my $nginx_version = Test::Nginx::Util::get_nginx_version();
9+
10+
if (eval "$nginx_version >= 1.25.5") {
11+
$SkipReason = "Nginx version greater than 1.25.5 have changed behavior, current version $nginx_version";
12+
}
13+
}
14+
15+
use Test::Nginx::Socket::Lua::Stream $SkipReason ? (skip_all => $SkipReason) : ();
16+
417
repeat_each(2);
518

619
plan tests => repeat_each() * (blocks() * 5);

t/023-preread/tcp-socket-timeout.t

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# vim:set ft= ts=4 sw=4 et fdm=marker:
22

3+
our $SkipReason;
4+
5+
BEGIN {
6+
use Test::Nginx::Util;
7+
8+
my $nginx_version = Test::Nginx::Util::get_nginx_version();
9+
10+
if (eval "$nginx_version >= 1.25.5") {
11+
$SkipReason = "Nginx version greater than 1.25.5 have changed behavior, current version $nginx_version";
12+
}
13+
}
14+
315
BEGIN {
416
if (!defined $ENV{LD_PRELOAD}) {
517
$ENV{LD_PRELOAD} = '';
@@ -20,7 +32,7 @@ BEGIN {
2032
$ENV{MOCKEAGAIN_WRITE_TIMEOUT_PATTERN} = 'get helloworld';
2133
}
2234

23-
use Test::Nginx::Socket::Lua::Stream;
35+
use Test::Nginx::Socket::Lua::Stream $SkipReason ? (skip_all => $SkipReason) : ();
2436
repeat_each(2);
2537

2638
plan tests => repeat_each() * (blocks() * 4 + 8);

t/023-preread/tcp-socket.t

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
# vim:set ft= ts=4 sw=4 et fdm=marker:
22

3-
use Test::Nginx::Socket::Lua::Stream;
3+
our $SkipReason;
4+
5+
BEGIN {
6+
use Test::Nginx::Util;
7+
8+
my $nginx_version = Test::Nginx::Util::get_nginx_version();
9+
10+
if (eval "$nginx_version >= 1.25.5") {
11+
$SkipReason = "Nginx version greater than 1.25.5 have changed behavior, current version $nginx_version";
12+
}
13+
}
14+
15+
use Test::Nginx::Socket::Lua::Stream $SkipReason ? (skip_all => $SkipReason) : ();
416
repeat_each(2);
517

618
plan tests => repeat_each() * 24;

0 commit comments

Comments
 (0)