# HG changeset patch # User Andrey Zelenkov # Date 1435592222 -10800 # Node ID 2d9f5f43959831cfb2084e542d154b42b8f4c012 # Parent 35832048546eae91338d8de4b188a2b2bd48e90f Tests: added stream proxy protocol availability check. diff --git a/stream_proxy_protocol.t b/stream_proxy_protocol.t --- a/stream_proxy_protocol.t +++ b/stream_proxy_protocol.t @@ -25,7 +25,7 @@ use Test::Nginx; select STDERR; $| = 1; select STDOUT; $| = 1; -my $t = Test::Nginx->new()->has(qw/stream/)->plan(2) +my $t = Test::Nginx->new()->has(qw/stream/) ->write_file_expand('nginx.conf', <<'EOF'); %%TEST_GLOBALS%% @@ -53,7 +53,8 @@ stream { EOF $t->run_daemon(\&stream_daemon); -$t->run()->waitforsocket('127.0.0.1:8081'); +$t->try_run('no stream proxy_protocol')->plan(2); +$t->waitforsocket('127.0.0.1:8081'); ############################################################################### diff --git a/stream_proxy_protocol_ipv6.t b/stream_proxy_protocol_ipv6.t --- a/stream_proxy_protocol_ipv6.t +++ b/stream_proxy_protocol_ipv6.t @@ -67,7 +67,7 @@ stream { EOF $t->run_daemon(\&stream_daemon); -$t->try_run('no inet6 support')->plan(2); +$t->try_run('no inet6 support or stream proxy_protocol')->plan(2); $t->waitforsocket('127.0.0.1:8082'); ###############################################################################