tests: updated ci for stream >= 1.25.5.

.travis.yml

@@ -57,7 +57,7 @@ install:
   - if [ ! -f download-cache/openssl-$OPENSSL_VER.tar.gz ]; then wget -P download-cache https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz || wget -P download-cache https://www.openssl.org/source/old/${OPENSSL_VER//[a-z]/}/openssl-$OPENSSL_VER.tar.gz; fi
   - git clone https://github.com/openresty/openresty-devel-utils.git
   - git clone https://github.com/openresty/lua-cjson.git
-  - git clone -b bump-1.27.0 https://github.com/xiaocang/openresty.git ../openresty
+  - git clone https://github.com/openresty/openresty.git ../openresty
   - git clone https://github.com/openresty/no-pool-nginx.git ../no-pool-nginx
   - git clone https://github.com/simpl/ngx_devel_kit.git ../ndk-nginx-module
   - git clone https://github.com/openresty/mockeagain.git

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
 
 
 

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

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
 
 
 

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);

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);

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;