diff --git a/.travis.yml b/.travis.yml index a3ad9fb8..44651300 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,16 +44,14 @@ env: - TEST_NGINX_SLEEP=0.006 matrix: #- NGINX_VERSION=1.21.4 OPENSSL_VER=1.1.12 - - NGINX_VERSION=1.25.3 OPENSSL_VER=1.1.1w - - NGINX_VERSION=1.25.3 OPENSSL_VER=1.1.1w USE_PCRE2=Y + - NGINX_VERSION=1.27.0 OPENSSL_VER=1.1.1w + - NGINX_VERSION=1.27.0 OPENSSL_VER=1.1.1w USE_PCRE2=Y services: - memcache - redis-server install: - - sudo apt update - - sudo apt install --only-upgrade ca-certificates - if [ "$USE_PCRE2" != "Y" ] && [ ! -f download-cache/pcre-$PCRE_VER.tar.gz ]; then wget -P download-cache/ https://downloads.sourceforge.net/project/pcre/pcre/${PCRE_VER}/pcre-${PCRE_VER}.tar.gz; fi - if [ "$USE_PCRE2" = "Y" ] && [ ! -f download-cache/pcre2-$PCRE2_VER.tar.gz ]; then wget -P download-cache https://downloads.sourceforge.net/project/pcre/pcre2/${PCRE2_VER}/pcre2-${PCRE2_VER}.tar.gz; fi - 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 diff --git a/t/023-preread/client-abort.t b/t/023-preread/client-abort.t index 1fd56b13..6209e626 100644 --- 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 index 329b8772..413aa149 100644 --- 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 index a3e3b6b8..613f95a7 100644 --- 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 index dce45863..43d6344b 100644 --- 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 index 59ea21d2..58d392eb 100644 --- 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 index ea7c5072..af2670ba 100644 --- 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;