diff stream_proxy_protocol_ipv6.t @ 974:882267679006

Tests: simplified parallel modifications in tests. Mail tests were simplified in c227348453db.
author Andrey Zelenkov <zelenkov@nginx.com>
date Tue, 12 Jul 2016 17:39:03 +0300
parents e9064d691790
children 196d33c2bb45
line wrap: on
line diff
--- a/stream_proxy_protocol_ipv6.t
+++ b/stream_proxy_protocol_ipv6.t
@@ -38,24 +38,24 @@ events {
 
 stream {
     server {
-        listen          127.0.0.1:%%PORT_0%%;
-        proxy_pass      [::1]:%%PORT_0%%;
+        listen          127.0.0.1:8080;
+        proxy_pass      [::1]:%%PORT_8080%%;
     }
 
     server {
-        listen          127.0.0.1:%%PORT_1%%;
-        proxy_pass      [::1]:%%PORT_1%%;
+        listen          127.0.0.1:8081;
+        proxy_pass      [::1]:%%PORT_8081%%;
     }
 
     server {
-        listen          [::1]:%%PORT_0%%;
-        proxy_pass      127.0.0.1:%%PORT_2%%;
+        listen          [::1]:%%PORT_8080%%;
+        proxy_pass      127.0.0.1:8082;
         proxy_protocol  on;
     }
 
     server {
-        listen          [::1]:%%PORT_1%%;
-        proxy_pass      127.0.0.1:%%PORT_2%%;
+        listen          [::1]:%%PORT_8081%%;
+        proxy_pass      127.0.0.1:8082;
     }
 }
 
@@ -63,15 +63,15 @@ EOF
 
 $t->run_daemon(\&stream_daemon);
 $t->try_run('no inet6 support or stream proxy_protocol')->plan(2);
-$t->waitforsocket('127.0.0.1:' . port(2));
+$t->waitforsocket('127.0.0.1:' . port(8082));
 
 ###############################################################################
 
-my $dp = port(0);
+my $dp = port(8080);
 
 like(stream('127.0.0.1:' . $dp)->io('close'),
 	qr/PROXY TCP6 ::1 ::1 \d+ $dp$CRLF/, 'protocol on');
-unlike(stream('127.0.0.1:' . port(1))->io('close'), qr/PROXY/,
+unlike(stream('127.0.0.1:' . port(8081))->io('close'), qr/PROXY/,
 	'protocol off');
 
 ###############################################################################
@@ -79,7 +79,7 @@ unlike(stream('127.0.0.1:' . port(1))->i
 sub stream_daemon {
 	my $server = IO::Socket::INET->new(
 		Proto => 'tcp',
-		LocalHost => '127.0.0.1:' . port(2),
+		LocalHost => '127.0.0.1:' . port(8082),
 		Listen => 5,
 		Reuse => 1
 	)