Mercurial > hg > nginx-tests

changeset 1128:bef8be8a6224

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: avoid reopening a receiving UDP socket in syslog tests.
author Sergey Kandaurov <pluknet@nginx.com>
date Fri, 10 Feb 2017 13:55:39 +0300
parents 6620cd57a96a
children 1173800a4a19
files debug_connection_syslog.t syslog.t
diffstat 2 files changed, 18 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/debug_connection_syslog.t
+++ b/debug_connection_syslog.t
@@ -58,10 +58,18 @@ EOF
 
 ###############################################################################
 
-is(get_syslog('/', port(8081)), '', 'no debug_connection syslog 1');
-is(get_syslog('/', port(8082)), '', 'no debug_connection syslog 2');
+my ($s1, $s2) = map {
+	IO::Socket::INET->new(
+		Proto => 'udp',
+		LocalAddr => "127.0.0.1:$_"
+	)
+		or die "Can't open syslog socket $_: $!";
+} port(8081), port(8082);
 
-my @msgs = get_syslog('/debug', port(8081), port(8082));
+is(get_syslog('/', $s1), '', 'no debug_connection syslog 1');
+is(get_syslog('/', $s2), '', 'no debug_connection syslog 2');
+
+my @msgs = get_syslog('/debug', $s1, $s2);
 like($msgs[0], qr/\[debug\]/, 'debug_connection syslog 1');
 like($msgs[1], qr/\[debug\]/, 'debug_connection syslog 2');
 is($msgs[0], $msgs[1], 'debug_connection syslog1 syslog2 match');
@@ -69,28 +77,9 @@ is($msgs[0], $msgs[1], 'debug_connection
 ###############################################################################
 
 sub get_syslog {
-	my ($uri, @port) = @_;
-	my (@s);
+	my ($uri, @s) = @_;
 	my @data;
 
-	eval {
-		local $SIG{ALRM} = sub { die "timeout\n" };
-		local $SIG{PIPE} = sub { die "sigpipe\n" };
-		alarm(1);
-		map {
-			push @s, IO::Socket::INET->new(
-				Proto => 'udp',
-				LocalAddr => "127.0.0.1:$_"
-			);
-		} (@port);
-		alarm(0);
-	};
-	alarm(0);
-	if ($@) {
-		log_in("died: $@");
-		return undef;
-	}
-
 	http_get($uri);
 
 	map {
@@ -102,7 +91,6 @@ sub get_syslog {
 			$data .= $buffer;
 		}
 		push @data, $data;
-		$_->close();
 	} (@s);
 
 	return $data[0] if scalar @data == 1;
--- a/syslog.t
+++ b/syslog.t
@@ -153,6 +153,12 @@ EOF
 
 ###############################################################################
 
+my $s = IO::Socket::INET->new(
+	Proto => 'udp',
+	LocalAddr => '127.0.0.1:' . port(8084)
+)
+	or die "Can't open syslog socket: $!";
+
 parse_syslog_message('error_log', get_syslog('/e'));
 parse_syslog_message('access_log', get_syslog('/a'));
 
@@ -243,25 +249,8 @@ sub levels {
 
 sub get_syslog {
 	my ($uri) = @_;
-	my ($s);
 	my $data = '';
 
-	eval {
-		local $SIG{ALRM} = sub { die "timeout\n" };
-		local $SIG{PIPE} = sub { die "sigpipe\n" };
-		alarm(1);
-		$s = IO::Socket::INET->new(
-			Proto => 'udp',
-			LocalAddr => '127.0.0.1:' . port(8084)
-		);
-		alarm(0);
-	};
-	alarm(0);
-	if ($@) {
-		log_in("died: $@");
-		return undef;
-	}
-
 	http_get($uri);
 
 	IO::Select->new($s)->can_read(1);
@@ -270,7 +259,6 @@ sub get_syslog {
 		sysread($s, $buffer, 4096);
 		$data .= $buffer;
 	}
-	$s->close();
 	return $data;
 }