Tests: let tests pass on travis-ci VMs with disabled IPv6 loopback.

pluknet · pluknet · commit 63ebb11e84a0 · 2017-06-15T19:42:26.000+03:00
diff --git a/access.t b/access.t
@@ -80,7 +80,7 @@ http {
 
 EOF
 
-$t->run()->plan(12);
+$t->try_run('no inet6 support')->plan(12);
 
 ###############################################################################
 
diff --git 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);
 
 ###############################################################################
 
diff --git 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);
 
 ###############################################################################
 
diff --git 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;
diff --git 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);
diff --git 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);
 
 ###############################################################################
 
diff --git 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);
 
 ###############################################################################
 
diff --git 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));
 
diff --git 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);
 
 ###############################################################################
 
diff --git 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));
 
 ###############################################################################
diff --git 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));
 
 ###############################################################################
diff --git 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);
 
 ###############################################################################
 
diff --git a/stream_variables.t b/stream_variables.t
@@ -76,7 +76,7 @@ stream {
 
 EOF
 
-$t->try_run('no stream return')->plan(8);
+$t->try_run('no stream return or inet6 support')->plan(8);
 
 ###############################################################################
 
