# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1331733036 -14400
# Node ID 5137f27935b4de129f577011a29c8fe6c06e8d54
# Parent  6bac00bba8d4e10cd47023a82cd476b13b2704b7
Tests: log timeouts in IMAP/POP3/SMTP.

diff --git a/lib/Test/Nginx.pm b/lib/Test/Nginx.pm
--- 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;
 }
 
diff --git a/lib/Test/Nginx/IMAP.pm b/lib/Test/Nginx/IMAP.pm
--- 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 $_;
diff --git a/lib/Test/Nginx/POP3.pm b/lib/Test/Nginx/POP3.pm
--- 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 $_;
diff --git a/lib/Test/Nginx/SMTP.pm b/lib/Test/Nginx/SMTP.pm
--- 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 $_;