Mercurial > hg > nginx-tests
changeset 1026:e74a9342eb96
Tests: stream tests for per-upstream variables.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Mon, 05 Sep 2016 22:57:44 +0300 |
parents | 94f8cd9b41dc |
children | 6ef255ed4bbc |
files | stream_udp_upstream.t stream_upstream.t |
diffstat | 2 files changed, 24 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/stream_udp_upstream.t Mon Sep 05 22:57:44 2016 +0300 +++ b/stream_udp_upstream.t Mon Sep 05 22:57:44 2016 +0300 @@ -23,7 +23,7 @@ select STDERR; $| = 1; select STDOUT; $| = 1; -my $t = Test::Nginx->new()->has(qw/stream udp/)->plan(4) +my $t = Test::Nginx->new()->has(qw/stream udp/) ->write_file_expand('nginx.conf', <<'EOF'); %%TEST_GLOBALS%% @@ -37,6 +37,9 @@ proxy_responses 1; proxy_timeout 1s; + log_format bytes $upstream_addr! + $upstream_bytes_sent!$upstream_bytes_received; + upstream u { server 127.0.0.1:%%PORT_8084_UDP%%; server 127.0.0.1:%%PORT_8085_UDP%%; @@ -77,6 +80,7 @@ server { listen 127.0.0.1:%%PORT_8083_UDP%% udp; proxy_pass u4; + access_log %%TESTDIR%%/u.log bytes; } } @@ -84,20 +88,25 @@ $t->run_daemon(\&udp_daemon, port(8084), $t); $t->run_daemon(\&udp_daemon, port(8085), $t); -$t->run(); +$t->try_run('no stream access_log')->plan(5); $t->waitforfile($t->testdir . '/' . port(8084)); $t->waitforfile($t->testdir . '/' . port(8085)); ############################################################################### -my @ports = my ($port4, $port5) = (port(8084), port(8085)); +my @ports = my ($port4, $port5, $port6) = (port(8084), port(8085), port(8086)); is(many(30, port(8080)), "$port4: 15, $port5: 15", 'balanced'); is(many(30, port(8081)), "$port4: 15, $port5: 15", 'failures'); is(many(30, port(8082)), "$port4: 10, $port5: 20", 'weight'); is(many(30, port(8083)), "$port4: 30", 'backup'); +$t->stop(); + +like($t->read_file('u.log'), qr/127.0.0.1:$port6, 127.0.0.1:$port4!1, 1!0, 4/, + 'per-upstream variables'); + ############################################################################### sub many {
--- a/stream_upstream.t Mon Sep 05 22:57:44 2016 +0300 +++ b/stream_upstream.t Mon Sep 05 22:57:44 2016 +0300 @@ -25,7 +25,7 @@ select STDERR; $| = 1; select STDOUT; $| = 1; -my $t = Test::Nginx->new()->has(qw/stream/)->plan(4) +my $t = Test::Nginx->new()->has(qw/stream/) ->write_file_expand('nginx.conf', <<'EOF'); %%TEST_GLOBALS%% @@ -36,6 +36,9 @@ } stream { + log_format bytes $upstream_addr! + $upstream_bytes_sent!$upstream_bytes_received; + upstream u { server 127.0.0.1:8084; server 127.0.0.1:8085; @@ -78,6 +81,7 @@ server { listen 127.0.0.1:8083; proxy_pass u4; + access_log %%TESTDIR%%/u.log bytes; } } @@ -85,20 +89,25 @@ $t->run_daemon(\&stream_daemon, port(8084)); $t->run_daemon(\&stream_daemon, port(8085)); -$t->run(); +$t->try_run('no stream access_log')->plan(5); $t->waitforsocket('127.0.0.1:' . port(8084)); $t->waitforsocket('127.0.0.1:' . port(8085)); ############################################################################### -my @ports = my ($port4, $port5) = (port(8084), port(8085)); +my @ports = my ($port4, $port5, $port6) = (port(8084), port(8085), port(8086)); is(many(30, port(8080)), "$port4: 15, $port5: 15", 'balanced'); is(many(30, port(8081)), "$port4: 15, $port5: 15", 'failures'); is(many(30, port(8082)), "$port4: 10, $port5: 20", 'weight'); is(many(30, port(8083)), "$port4: 30", 'backup'); +$t->stop(); + +like($t->read_file('u.log'), qr/127.0.0.1:$port6, 127.0.0.1:$port4!0, 1!0, 4/, + 'per-upstream variables'); + ############################################################################### sub many {