changeset 1872:7a27a4e4fdae

Tests: extended check for ALPN in mail_ssl.t. The 'alpn' test might fail if ALPN is not supported in Net::SSLeay. Patch by Maxim Dounin.
author Sergey Kandaurov <pluknet@nginx.com>
date Tue, 23 May 2023 16:50:08 +0400
parents 1ba5108b6c24
children f7f1f349dd26
files mail_ssl.t
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/mail_ssl.t
+++ b/mail_ssl.t
@@ -164,6 +164,16 @@ like($s->socket()->dump_peer_certificate
 
 # alpn
 
+SKIP: {
+skip 'LibreSSL too old', 2
+	if $t->has_module('LibreSSL')
+	and not $t->has_feature('libressl:3.4.0');
+skip 'OpenSSL too old', 2
+	if $t->has_module('OpenSSL')
+	and not $t->has_feature('openssl:1.1.0');
+skip 'no ALPN support in IO::Socket::SSL', 2
+	unless $t->has_feature('socket_ssl_alpn');
+
 $s = Test::Nginx::IMAP->new(
 	PeerAddr => '127.0.0.1:' . port(8148),
 	SSL => 1,
@@ -171,18 +181,8 @@ like($s->socket()->dump_peer_certificate
 );
 $s->ok('alpn');
 
-SKIP: {
-skip 'LibreSSL too old', 1
-	if $t->has_module('LibreSSL')
-	and not $t->has_feature('libressl:3.4.0');
-skip 'OpenSSL too old', 1
-	if $t->has_module('OpenSSL')
-	and not $t->has_feature('openssl:1.1.0');
-
 TODO: {
 local $TODO = 'not yet' unless $t->has_version('1.21.4');
-local $TODO = 'no ALPN support in IO::Socket::SSL'
-	unless $t->has_feature('socket_ssl_alpn');
 
 $s = Test::Nginx::IMAP->new(
 	PeerAddr => '127.0.0.1:' . port(8148),