Mercurial > hg > nginx-tests
changeset 209:5137f27935b4
Tests: log timeouts in IMAP/POP3/SMTP.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 14 Mar 2012 17:50:36 +0400 |
parents | 6bac00bba8d4 |
children | a5f810eb87a2 |
files | lib/Test/Nginx.pm lib/Test/Nginx/IMAP.pm lib/Test/Nginx/POP3.pm lib/Test/Nginx/SMTP.pm |
diffstat | 4 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/Test/Nginx.pm +++ b/lib/Test/Nginx.pm @@ -379,9 +379,8 @@ sub http($;%) { if ($@) { log_in("died: $@"); return undef; - } else { - log_in($reply); } + log_in($reply); return $reply; }
--- a/lib/Test/Nginx/IMAP.pm +++ b/lib/Test/Nginx/IMAP.pm @@ -41,7 +41,7 @@ sub send { sub read { my ($self) = @_; eval { - local $SIG{ALRM} = sub { die "alarm\n" }; + local $SIG{ALRM} = sub { die "timeout\n" }; alarm(2); while (<$self>) { log_in($_); @@ -53,6 +53,7 @@ sub read { }; alarm(0); if ($@) { + log_in("died: $@"); return undef; } return $_;
--- a/lib/Test/Nginx/POP3.pm +++ b/lib/Test/Nginx/POP3.pm @@ -41,7 +41,7 @@ sub send { sub read { my ($self) = @_; eval { - local $SIG{ALRM} = sub { die "alarm\n" }; + local $SIG{ALRM} = sub { die "timeout\n" }; alarm(2); while (<$self>) { log_in($_); @@ -53,6 +53,7 @@ sub read { }; alarm(0); if ($@) { + log_in("died: $@"); return undef; } return $_;
--- a/lib/Test/Nginx/SMTP.pm +++ b/lib/Test/Nginx/SMTP.pm @@ -41,7 +41,7 @@ sub send { sub read { my ($self) = @_; eval { - local $SIG{ALRM} = sub { die "alarm\n" }; + local $SIG{ALRM} = sub { die "timeout\n" }; alarm(2); while (<$self>) { log_in($_); @@ -52,6 +52,7 @@ sub read { }; alarm(0); if ($@) { + log_in("died: $@"); return undef; } return $_;