Mercurial > hg > nginx-tests
diff stream_error_log.t @ 952:e9064d691790
Tests: converted tests to run in parallel.
author | Andrey Zelenkov <zelenkov@nginx.com> |
---|---|
date | Tue, 21 Jun 2016 16:39:13 +0300 |
parents | 6bb1f2ccd386 |
children | 882267679006 |
line wrap: on
line diff
--- a/stream_error_log.t +++ b/stream_error_log.t @@ -35,7 +35,7 @@ my $t = Test::Nginx->new()->has(qw/strea error_log %%TESTDIR%%/e_glob.log info; error_log %%TESTDIR%%/e_glob2.log info; -error_log syslog:server=127.0.0.1:8083 info; +error_log syslog:server=127.0.0.1:%%PORT_3_UDP%% info; daemon off; @@ -44,11 +44,11 @@ events { stream { upstream u { - server 127.0.0.1:8083 down; + server 127.0.0.1:%%PORT_3_UDP%% down; } server { - listen 127.0.0.1:8080; + listen 127.0.0.1:%%PORT_0%%; proxy_pass u; error_log %%TESTDIR%%/e_debug.log debug; @@ -58,12 +58,12 @@ stream { } server { - listen 127.0.0.1:8082; - proxy_pass 127.0.0.1:8081; + listen 127.0.0.1:%%PORT_2%%; + proxy_pass 127.0.0.1:%%PORT_1%%; error_log %%TESTDIR%%/e_stream.log info; - error_log syslog:server=127.0.0.1:8080 info; - error_log syslog:server=127.0.0.1:8084 info; + error_log syslog:server=127.0.0.1:%%PORT_5_UDP%% info; + error_log syslog:server=127.0.0.1:%%PORT_4_UDP%% info; } } @@ -75,10 +75,10 @@ open my $stderr, '<', $t->testdir() . '/ or die "Can't open stderr file: $!"; $t->run_daemon(\&stream_daemon); -$t->run_daemon(\&syslog_daemon, 8083, $t, 's_glob.log'); -$t->run_daemon(\&syslog_daemon, 8084, $t, 's_stream.log'); +$t->run_daemon(\&syslog_daemon, port(3), $t, 's_glob.log'); +$t->run_daemon(\&syslog_daemon, port(4), $t, 's_stream.log'); -$t->waitforsocket('127.0.0.1:8081'); +$t->waitforsocket('127.0.0.1:' . port(1)); $t->waitforfile($t->testdir . '/s_glob.log'); $t->waitforfile($t->testdir . '/s_stream.log'); @@ -113,7 +113,8 @@ is_deeply(levels($t, 'e_glob.log'), leve # syslog -parse_syslog_message('syslog', get_syslog('data2', '127.0.0.1:8082')); +parse_syslog_message('syslog', get_syslog('data2', '127.0.0.1:' . port(2), + port(5))); is_deeply(levels($t, 's_glob.log'), levels($t, 'e_glob.log'), 'global syslog messages'); @@ -126,7 +127,7 @@ SKIP: { skip "relies on error log contents", 5 unless $ENV{TEST_NGINX_UNSAFE}; my $msg = 'no live upstreams while connecting to upstream, ' - . 'client: 127.0.0.1, server: 127.0.0.1:8080, upstream: "u"'; + . 'client: 127.0.0.1, server: 127.0.0.1:' . port(0) . ', upstream: "u"'; unlike($t->read_file('e_glob.log'), qr/$msg/ms, 'stream error in global'); like($t->read_file('e_info.log'), qr/$msg/ms, 'stream error in info'); @@ -168,8 +169,6 @@ sub get_syslog { my ($data, $peer, $port) = @_; my ($s); - $port = 8080 unless defined $port; - eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; @@ -276,7 +275,7 @@ sub stream_daemon { my $server = IO::Socket::INET->new( Proto => 'tcp', LocalHost => '127.0.0.1', - LocalPort => 8081, + LocalPort => port(1), Listen => 5, Reuse => 1 )