Mercurial > hg > nginx-tests

changeset 339:9d0a2fa47ac6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: change http timeout to 5s, imap/pop3/smtp to 3s. Excessive testing shows it should be enough to don't trigger false positive test suite failures on slow machines. Drop custom timeouts as previously used by dav_chunked.t accordingly.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 23 Sep 2013 22:54:43 +0400
parents 8f0010dc4b09
children 9920a522a2de
files dav_chunked.t lib/Test/Nginx.pm lib/Test/Nginx/IMAP.pm lib/Test/Nginx/POP3.pm lib/Test/Nginx/SMTP.pm
diffstat 5 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/dav_chunked.t
+++ b/dav_chunked.t
@@ -87,7 +87,7 @@ is(read_file($t->testdir() . '/file'), '
 
 my $body = ('a' . CRLF . '1234567890' . CRLF) x 1024 . '0' . CRLF . CRLF;
 
-$r = http(<<EOF, timeout => 5);
+$r = http(<<EOF);
 PUT /file HTTP/1.1
 Host: localhost
 Connection: close
--- a/lib/Test/Nginx.pm
+++ b/lib/Test/Nginx.pm
@@ -431,7 +431,7 @@ sub http($;%) {
 	eval {
 		local $SIG{ALRM} = sub { die "timeout\n" };
 		local $SIG{PIPE} = sub { die "sigpipe\n" };
-		alarm($extra{timeout} || 2);
+		alarm(5);
 
 		my $s = $extra{socket} || IO::Socket::INET->new(
 			Proto => 'tcp',
--- a/lib/Test/Nginx/IMAP.pm
+++ b/lib/Test/Nginx/IMAP.pm
@@ -42,7 +42,7 @@ sub read {
 	my ($self) = @_;
 	eval {
 		local $SIG{ALRM} = sub { die "timeout\n" };
-		alarm(2);
+		alarm(3);
 		while (<$self>) {
 			log_in($_);
 			# XXX
--- a/lib/Test/Nginx/POP3.pm
+++ b/lib/Test/Nginx/POP3.pm
@@ -42,7 +42,7 @@ sub read {
 	my ($self) = @_;
 	eval {
 		local $SIG{ALRM} = sub { die "timeout\n" };
-		alarm(2);
+		alarm(3);
 		while (<$self>) {
 			log_in($_);
 			# XXX
--- a/lib/Test/Nginx/SMTP.pm
+++ b/lib/Test/Nginx/SMTP.pm
@@ -42,7 +42,7 @@ sub read {
 	my ($self) = @_;
 	eval {
 		local $SIG{ALRM} = sub { die "timeout\n" };
-		alarm(2);
+		alarm(3);
 		while (<$self>) {
 			log_in($_);
 			next if m/^\d\d\d-/;