Google GitGoogle Git
Sign in
nginx/nginx-tests/68f63f2157c38dddbe77e85aa9709d0433157695^!/.
commit
68f63f2157c38dddbe77e85aa9709d0433157695
[log]
author
Sergey Kandaurov <pluknet@nginx.com>
Fri Nov 30 12:55:31 2018 +0300
committer
Sergey Kandaurov <pluknet@nginx.com>
Fri Nov 30 12:55:31 2018 +0300
tree
793f649fef6a425632af73ee4a191d174302b79c
parent
38d6fc4c71ad874fcfcf0bcb171803eeb7cd71da [diff]
Tests: adjusted client connect timeout in various tests with SSL.

diff --git a/h2_ssl_verify_client.t b/h2_ssl_verify_client.t
index 93d0a41..f65c267 100644
--- a/h2_ssl_verify_client.t
+++ b/h2_ssl_verify_client.t

@@ -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',

diff --git a/ssl.t b/ssl.t
index 4fcb43e..3565cad 100644
--- a/ssl.t
+++ b/ssl.t

@@ -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',

diff --git a/ssl_certificate_chain.t b/ssl_certificate_chain.t
index afb056b..2934e34 100644
--- a/ssl_certificate_chain.t
+++ b/ssl_certificate_chain.t

@@ -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',

diff --git a/ssl_certificates.t b/ssl_certificates.t
index 8c6e0c8..dcebaaf 100644
--- a/ssl_certificates.t
+++ b/ssl_certificates.t

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

diff --git a/ssl_client_escaped_cert.t b/ssl_client_escaped_cert.t
index d5cc29c..259c5be 100644
--- a/ssl_client_escaped_cert.t
+++ b/ssl_client_escaped_cert.t

@@ -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',

diff --git a/ssl_crl.t b/ssl_crl.t
index 5e82944..ba4261d 100644
--- a/ssl_crl.t
+++ b/ssl_crl.t

@@ -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',

diff --git a/ssl_password_file.t b/ssl_password_file.t
index 60aacc3..e1bcca3 100644
--- a/ssl_password_file.t
+++ b/ssl_password_file.t

@@ -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),

diff --git a/ssl_proxy_protocol.t b/ssl_proxy_protocol.t
index 896e2fe..8615921 100644
--- a/ssl_proxy_protocol.t
+++ b/ssl_proxy_protocol.t

@@ -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] }

diff --git a/ssl_sni.t b/ssl_sni.t
index 3f8061c..26fb124 100644
--- a/ssl_sni.t
+++ b/ssl_sni.t

@@ -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),

diff --git a/ssl_sni_reneg.t b/ssl_sni_reneg.t
index 21bb697..8036d6f 100644
--- a/ssl_sni_reneg.t
+++ b/ssl_sni_reneg.t

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

diff --git a/ssl_sni_sessions.t b/ssl_sni_sessions.t
index 24c6048..8b04c83 100644
--- a/ssl_sni_sessions.t
+++ b/ssl_sni_sessions.t

@@ -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',

diff --git a/ssl_stapling.t b/ssl_stapling.t
index 0c216f3..251689b 100644
--- a/ssl_stapling.t
+++ b/ssl_stapling.t

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

diff --git a/ssl_verify_depth.t b/ssl_verify_depth.t
index 1e438d1..452cccd 100644
--- a/ssl_verify_depth.t
+++ b/ssl_verify_depth.t

@@ -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',

diff --git a/stream_ssl_preread.t b/stream_ssl_preread.t
index 300bd3e..54085fa 100644
--- a/stream_ssl_preread.t
+++ b/stream_ssl_preread.t

@@ -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(),

diff --git a/stream_ssl_preread_alpn.t b/stream_ssl_preread_alpn.t
index 047e364..ec72b60 100644
--- a/stream_ssl_preread_alpn.t
+++ b/stream_ssl_preread_alpn.t

@@ -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(),

diff --git a/stream_ssl_realip.t b/stream_ssl_realip.t
index b2b93e9..42f10ca 100644
--- a/stream_ssl_realip.t
+++ b/stream_ssl_realip.t

@@ -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] }