Mercurial > hg > nginx-tests
changeset 1407:8c764fd93b5e
Tests: adjusted client connect timeout in various tests with SSL.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Fri, 30 Nov 2018 12:55:31 +0300 |
parents | 6404fd77f367 |
children | 51656beb9996 |
files | h2_ssl_verify_client.t ssl.t ssl_certificate_chain.t ssl_certificates.t ssl_client_escaped_cert.t ssl_crl.t ssl_password_file.t ssl_proxy_protocol.t ssl_sni.t ssl_sni_reneg.t ssl_sni_sessions.t ssl_stapling.t ssl_verify_depth.t stream_ssl_preread.t stream_ssl_preread_alpn.t stream_ssl_realip.t |
diffstat | 16 files changed, 17 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/h2_ssl_verify_client.t Thu Nov 29 19:18:20 2018 +0300 +++ b/h2_ssl_verify_client.t Fri Nov 30 12:55:31 2018 +0300 @@ -114,7 +114,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1',
--- a/ssl.t Thu Nov 29 19:18:20 2018 +0300 +++ b/ssl.t Fri Nov 30 12:55:31 2018 +0300 @@ -300,7 +300,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1',
--- a/ssl_certificate_chain.t Thu Nov 29 19:18:20 2018 +0300 +++ b/ssl_certificate_chain.t Fri Nov 30 12:55:31 2018 +0300 @@ -150,7 +150,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1',
--- a/ssl_certificates.t Thu Nov 29 19:18:20 2018 +0300 +++ b/ssl_certificates.t Fri Nov 30 12:55:31 2018 +0300 @@ -121,7 +121,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); $s = IO::Socket::INET->new('127.0.0.1:' . port(8080)); alarm(0); };
--- a/ssl_client_escaped_cert.t Thu Nov 29 19:18:20 2018 +0300 +++ b/ssl_client_escaped_cert.t Fri Nov 30 12:55:31 2018 +0300 @@ -101,7 +101,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1',
--- a/ssl_crl.t Thu Nov 29 19:18:20 2018 +0300 +++ b/ssl_crl.t Fri Nov 30 12:55:31 2018 +0300 @@ -178,7 +178,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1',
--- a/ssl_password_file.t Thu Nov 29 19:18:20 2018 +0300 +++ b/ssl_password_file.t Fri Nov 30 12:55:31 2018 +0300 @@ -147,7 +147,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1:' . port(8081),
--- a/ssl_proxy_protocol.t Thu Nov 29 19:18:20 2018 +0300 +++ b/ssl_proxy_protocol.t Fri Nov 30 12:55:31 2018 +0300 @@ -156,7 +156,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); IO::Socket::SSL->start_SSL($s, SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE(), SSL_error_trap => sub { die $_[1] }
--- a/ssl_sni.t Thu Nov 29 19:18:20 2018 +0300 +++ b/ssl_sni.t Fri Nov 30 12:55:31 2018 +0300 @@ -133,7 +133,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1:' . port(8080),
--- a/ssl_sni_reneg.t Thu Nov 29 19:18:20 2018 +0300 +++ b/ssl_sni_reneg.t Fri Nov 30 12:55:31 2018 +0300 @@ -155,7 +155,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); socket($s, &AF_INET, &SOCK_STREAM, 0) or die "socket: $!"; connect($s, $dest_serv_params) or die "connect: $!"; alarm(0);
--- a/ssl_sni_sessions.t Thu Nov 29 19:18:20 2018 +0300 +++ b/ssl_sni_sessions.t Fri Nov 30 12:55:31 2018 +0300 @@ -177,7 +177,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1',
--- a/ssl_stapling.t Thu Nov 29 19:18:20 2018 +0300 +++ b/ssl_stapling.t Fri Nov 30 12:55:31 2018 +0300 @@ -294,7 +294,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); $s = IO::Socket::INET->new('127.0.0.1:' . port($port)); alarm(0); }; @@ -335,7 +335,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); $s = IO::Socket::INET->new('127.0.0.1:' . port(8443)); alarm(0); };
--- a/ssl_verify_depth.t Thu Nov 29 19:18:20 2018 +0300 +++ b/ssl_verify_depth.t Fri Nov 30 12:55:31 2018 +0300 @@ -142,7 +142,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1',
--- a/stream_ssl_preread.t Thu Nov 29 19:18:20 2018 +0300 +++ b/stream_ssl_preread.t Fri Nov 30 12:55:31 2018 +0300 @@ -223,7 +223,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); IO::Socket::SSL->start_SSL($s->{_socket}, SSL_hostname => $host, SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE(),
--- a/stream_ssl_preread_alpn.t Thu Nov 29 19:18:20 2018 +0300 +++ b/stream_ssl_preread_alpn.t Fri Nov 30 12:55:31 2018 +0300 @@ -127,7 +127,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); IO::Socket::SSL->start_SSL($s->{_socket}, SSL_alpn_protocols => [ @alpn ], SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE(),
--- a/stream_ssl_realip.t Thu Nov 29 19:18:20 2018 +0300 +++ b/stream_ssl_realip.t Fri Nov 30 12:55:31 2018 +0300 @@ -134,7 +134,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(2); + alarm(5); IO::Socket::SSL->start_SSL($s->{_socket}, SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE(), SSL_error_trap => sub { die $_[1] }