Mercurial > hg > nginx-tests

diff lib/Test/Nginx.pm @ 144:6e11354cae8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: rework stopping to make "open socket left" alerts visible. Use SIGQUIT to stop nginx to make sure relevant checks are executed. Use separate functions to stop nginx and daemons to make it possible to stop nginx before daemons.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 15 Dec 2010 19:22:39 +0300
parents 8b62dd9b8615
children 33f6ec774efa
line wrap: on
line diff
--- a/lib/Test/Nginx.pm
+++ b/lib/Test/Nginx.pm
@@ -46,6 +46,7 @@ sub new {
 sub DESTROY {
 	my ($self) = @_;
 	$self->stop();
+	$self->stop_daemons();
 	if ($ENV{TEST_NGINX_CATLOG}) {
 		system("cat $self->{_testdir}/error.log");
 	}
@@ -196,19 +197,25 @@ sub waitforsocket($) {
 sub stop() {
 	my ($self) = @_;
 
+	return $self unless $self->{_started};
+
+	kill 'QUIT', `cat $self->{_testdir}/nginx.pid`;
+	wait;
+
+	$self->{_started} = 0;
+
+	return $self;
+}
+
+sub stop_daemons() {
+	my ($self) = @_;
+
 	while ($self->{_daemons} && scalar @{$self->{_daemons}}) {
 		my $p = shift @{$self->{_daemons}};
 		kill 'TERM', $p;
 		wait;
 	}
 
-	return $self unless $self->{_started};
-
-	kill 'TERM', `cat $self->{_testdir}/nginx.pid`;
-	wait;
-
-	$self->{_started} = 0;
-
 	return $self;
 }