Mercurial > hg > nginx-tests
changeset 1190:fcd65708672d
Tests: let tests pass on travis-ci VMs with disabled IPv6 loopback.
| author | Sergey Kandaurov <pluknet@nginx.com> |
|---|---|
| date | Thu, 15 Jun 2017 19:42:26 +0300 |
| parents | 1c703303feee |
| children | a9187b424a94 |
| files | access.t debug_connection.t debug_connection_syslog.t geo_ipv6.t http_resolver_aaaa.t proxy_protocol_ipv6.t proxy_ssl_name.t stream_access.t stream_geo_ipv6.t stream_proxy_protocol_ipv6.t stream_realip.t stream_ssl_realip.t stream_variables.t |
| diffstat | 13 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/access.t +++ b/access.t @@ -80,7 +80,7 @@ http { EOF -$t->run()->plan(12); +$t->try_run('no inet6 support')->plan(12); ###############################################################################
--- a/debug_connection.t +++ b/debug_connection.t @@ -52,7 +52,7 @@ http { EOF -$t->run()->plan(5); +$t->try_run('no inet6 support')->plan(5); ###############################################################################
--- a/debug_connection_syslog.t +++ b/debug_connection_syslog.t @@ -54,7 +54,7 @@ http { EOF -$t->run()->plan(5); +$t->try_run('no inet6 support')->plan(5); ###############################################################################
--- a/geo_ipv6.t +++ b/geo_ipv6.t @@ -91,7 +91,7 @@ EOF $t->write_file('index.html', ''); $t->write_file('addr', ''); -$t->run(); +$t->try_run('no inet6 support'); plan(skip_all => 'no ::1 on host') if http_get('/addr') !~ /X-IP: ::1/m;
--- a/http_resolver_aaaa.t +++ b/http_resolver_aaaa.t @@ -67,7 +67,7 @@ http { EOF -$t->run()->plan(72); +$t->try_run('no inet6 support')->plan(72); $t->run_daemon(\&dns_daemon, port(8081), $t); $t->run_daemon(\&dns_daemon, port(8082), $t);
--- a/proxy_protocol_ipv6.t +++ b/proxy_protocol_ipv6.t @@ -64,7 +64,7 @@ stream { EOF $t->write_file('t', 'SEE-THIS'); -$t->run()->plan(3); +$t->try_run('no inet6 support')->plan(3); ###############################################################################
--- a/proxy_ssl_name.t +++ b/proxy_ssl_name.t @@ -24,7 +24,7 @@ select STDERR; $| = 1; select STDOUT; $| = 1; my $t = Test::Nginx->new()->has(qw/http http_ssl sni proxy/) - ->has_daemon('openssl')->plan(9) + ->has_daemon('openssl') ->write_file_expand('nginx.conf', <<'EOF'); %%TEST_GLOBALS%% @@ -134,7 +134,7 @@ foreach my $name ('localhost') { $t->write_file('index.html', ''); -$t->run(); +$t->try_run('no inet6 support')->plan(9); ###############################################################################
--- a/stream_access.t +++ b/stream_access.t @@ -146,7 +146,7 @@ stream { EOF -$t->run()->plan(18); +$t->try_run('no inet6 support')->plan(18); $t->run_daemon(\&stream_daemon); $t->waitforsocket('127.0.0.1:' . port(8080));
--- a/stream_geo_ipv6.t +++ b/stream_geo_ipv6.t @@ -86,7 +86,7 @@ stream { EOF -$t->try_run('no stream geo')->plan(6); +$t->try_run('no stream geo or inet6 support')->plan(6); ###############################################################################
--- a/stream_proxy_protocol_ipv6.t +++ b/stream_proxy_protocol_ipv6.t @@ -62,7 +62,7 @@ stream { EOF $t->run_daemon(\&stream_daemon); -$t->run()->plan(2); +$t->try_run('no inet6 support')->plan(2); $t->waitforsocket('127.0.0.1:' . port(8082)); ###############################################################################
--- a/stream_realip.t +++ b/stream_realip.t @@ -82,7 +82,7 @@ stream { EOF $t->run_daemon(\&stream_daemon); -$t->try_run('no stream proxy_protocol')->plan(8); +$t->try_run('no stream proxy_protocol or inet6 support')->plan(8); $t->waitforsocket('127.0.0.1:' . port(8081)); ###############################################################################
--- a/stream_ssl_realip.t +++ b/stream_ssl_realip.t @@ -101,7 +101,7 @@ foreach my $name ('localhost') { or die "Can't create certificate for $name: $!\n"; } -$t->try_run('no stream proxy_protocol')->plan(6); +$t->try_run('no stream proxy_protocol or inet6 support')->plan(6); ###############################################################################