updated ci for stream >= 1.25.5.

openresty · Jun 24, 2024 · cfe4ff0 · cfe4ff0
1 parent a45de44
commit cfe4ff0
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 3 deletions.
diff --git a/t/023-preread/client-abort.t b/t/023-preread/client-abort.t
@@ -334,6 +334,7 @@ delete thread 1
 [error]
 --- error_log
 client prematurely closed connection
+--- skip_nginx: 4: >= 1.25.5
 
 
 

diff --git a/t/023-preread/req-socket.t b/t/023-preread/req-socket.t
@@ -391,6 +391,7 @@ finalize stream session: 200
 --- no_error_log
 [warn]
 [error]
+--- skip_nginx: 5: >= 1.25.5
 
 
 
@@ -509,6 +510,7 @@ received: hello world
 attempt to peek on a consumed socket
 --- no_error_log
 [warn]
+--- skip_nginx: 4: >= 1.25.5
 
 
 
@@ -568,3 +570,4 @@ $ssl_preread_server_name = my.sni.server.name while prereading client data
 [warn]
 assertion failed!
 lua entry thread aborted
+--- skip_nginx: 8: >= 1.25.5
diff --git a/t/023-preread/sanity.t b/t/023-preread/sanity.t
@@ -199,6 +199,7 @@ $ssl_preread_server_name = my.sni.server.name while prereading client data
 --- no_error_log
 [crit]
 [warn]
+--- skip_nginx: 5: >= 1.25.5
 
 
 

diff --git a/t/023-preread/socket-keepalive.t b/t/023-preread/socket-keepalive.t
@@ -1,6 +1,19 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use Test::Nginx::Socket::Lua::Stream;
+our $SkipReason;
+
+BEGIN {
+    use Test::Nginx::Util;
+
+    my $nginx_version = Test::Nginx::Util::get_nginx_version();
+
+    if (eval "$nginx_version >= 1.25.5") {
+        $SkipReason = "Nginx version greater than 1.25.5 have changed behavior, current version $nginx_version";
+    }
+}
+
+use Test::Nginx::Socket::Lua::Stream $SkipReason ? (skip_all => $SkipReason) : ();
+
 repeat_each(2);
 
 plan tests => repeat_each() * (blocks() * 5);

diff --git a/t/023-preread/tcp-socket-timeout.t b/t/023-preread/tcp-socket-timeout.t
@@ -1,5 +1,17 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
+our $SkipReason;
+
+BEGIN {
+    use Test::Nginx::Util;
+
+    my $nginx_version = Test::Nginx::Util::get_nginx_version();
+
+    if (eval "$nginx_version >= 1.25.5") {
+        $SkipReason = "Nginx version greater than 1.25.5 have changed behavior, current version $nginx_version";
+    }
+}
+
 BEGIN {
     if (!defined $ENV{LD_PRELOAD}) {
         $ENV{LD_PRELOAD} = '';
@@ -20,7 +32,7 @@ BEGIN {
     $ENV{MOCKEAGAIN_WRITE_TIMEOUT_PATTERN} = 'get helloworld';
 }
 
-use Test::Nginx::Socket::Lua::Stream;
+use Test::Nginx::Socket::Lua::Stream $SkipReason ? (skip_all => $SkipReason) : ();
 repeat_each(2);
 
 plan tests => repeat_each() * (blocks() * 4 + 8);

diff --git a/t/023-preread/tcp-socket.t b/t/023-preread/tcp-socket.t
@@ -1,6 +1,18 @@
 # vim:set ft= ts=4 sw=4 et fdm=marker:
 
-use Test::Nginx::Socket::Lua::Stream;
+our $SkipReason;
+
+BEGIN {
+    use Test::Nginx::Util;
+
+    my $nginx_version = Test::Nginx::Util::get_nginx_version();
+
+    if (eval "$nginx_version >= 1.25.5") {
+        $SkipReason = "Nginx version greater than 1.25.5 have changed behavior, current version $nginx_version";
+    }
+}
+
+use Test::Nginx::Socket::Lua::Stream $SkipReason ? (skip_all => $SkipReason) : ();
 repeat_each(2);
 
 plan tests => repeat_each() * 24;