Mercurial > hg > nginx-tests

changeset 628:0940773278c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: backed out previous change, adjusted general timeouts. The previous timeout values are commonly not enough when making mass-building.
author Sergey Kandaurov <pluknet@nginx.com>
date Thu, 09 Jul 2015 14:09:27 +0300
parents cb35a9ec4428
children 8f6b9f7f36d7
files lib/Test/Nginx.pm proxy_limit_rate.t
diffstat 2 files changed, 5 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/lib/Test/Nginx.pm
+++ b/lib/Test/Nginx.pm
@@ -298,7 +298,7 @@ sub waitforfile($;$) {
 	# wait for file to appear
 	# or specified process to exit
 
-	for (1 .. 30) {
+	for (1 .. 50) {
 		return 1 if -e $file;
 		return 0 if $exited;
 		$exited = waitpid($pid, WNOHANG) != 0 if $pid;
@@ -313,7 +313,7 @@ sub waitforsocket($) {
 
 	# wait for socket to accept connections
 
-	for (1 .. 30) {
+	for (1 .. 50) {
 		my $s = IO::Socket::INET->new(
 			Proto => 'tcp',
 			PeerAddr => $peer
@@ -541,7 +541,7 @@ sub http_start($;%) {
 	eval {
 		local $SIG{ALRM} = sub { die "timeout\n" };
 		local $SIG{PIPE} = sub { die "sigpipe\n" };
-		alarm(5);
+		alarm(8);
 
 		$s = $extra{socket} || IO::Socket::INET->new(
 			Proto => 'tcp',
@@ -578,7 +578,7 @@ sub http_end($;%) {
 	eval {
 		local $SIG{ALRM} = sub { die "timeout\n" };
 		local $SIG{PIPE} = sub { die "sigpipe\n" };
-		alarm(5);
+		alarm(8);
 
 		local $/;
 		$reply = $s->getline();
--- a/proxy_limit_rate.t
+++ b/proxy_limit_rate.t
@@ -58,8 +58,7 @@ EOF
 
 ###############################################################################
 
-my $s = http_get('/', start => 1);
-my $r = http_end_gentle($s);
+my $r = http_get('/');
 
 my ($t1) = $r =~ /X-Msec: (\d+)/;
 my $diff = time() - $t1;
@@ -70,29 +69,3 @@ cmp_ok(abs($diff - 3), '<=', 1, 'proxy_l
 like($r, qr/^(XXXXXXXXXX){4000}\x0d?\x0a?$/m, 'response body');
 
 ###############################################################################
-
-sub http_end_gentle {
-	my ($s) = @_;
-	my $reply;
-
-	eval {
-		local $SIG{ALRM} = sub { die "timeout\n" };
-		local $SIG{PIPE} = sub { die "sigpipe\n" };
-		alarm(8);
-
-		local $/;
-		$reply = $s->getline();
-
-		alarm(0);
-	};
-	alarm(0);
-	if ($@) {
-		log_in("died: $@");
-		return undef;
-	}
-
-	log_in($reply);
-	return $reply;
-}
-
-###############################################################################