Mercurial > hg > nginx-tests

diff stream_access.t @ 974:882267679006

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 cf14cfe9ec8c
line wrap: on
line diff
--- a/stream_access.t
+++ b/stream_access.t
@@ -36,110 +36,110 @@ events {
 
 stream {
     server {
-        listen       127.0.0.1:%%PORT_2%%;
-        proxy_pass   [::1]:%%PORT_0%%;
+        listen       127.0.0.1:8082;
+        proxy_pass   [::1]:%%PORT_8080%%;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_3%%;
+        listen       127.0.0.1:8083;
         proxy_pass   unix:%%TESTDIR%%/unix.sock.0;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_5%%;
-        proxy_pass   [::1]:%%PORT_1%%;
+        listen       127.0.0.1:8085;
+        proxy_pass   [::1]:%%PORT_8081%%;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_6%%;
+        listen       127.0.0.1:8086;
         proxy_pass   unix:%%TESTDIR%%/unix.sock.1;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_8%%;
-        proxy_pass   [::1]:%%PORT_2%%;
+        listen       127.0.0.1:8088;
+        proxy_pass   [::1]:%%PORT_8082%%;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_9%%;
+        listen       127.0.0.1:8089;
         proxy_pass   unix:%%TESTDIR%%/unix.sock.2;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_11%%;
-        proxy_pass   [::1]:%%PORT_3%%;
+        listen       127.0.0.1:8091;
+        proxy_pass   [::1]:%%PORT_8083%%;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_12%%;
+        listen       127.0.0.1:8092;
         proxy_pass   unix:%%TESTDIR%%/unix.sock.3;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_14%%;
-        proxy_pass   [::1]:%%PORT_4%%;
+        listen       127.0.0.1:8094;
+        proxy_pass   [::1]:%%PORT_8084%%;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_15%%;
+        listen       127.0.0.1:8095;
         proxy_pass   unix:%%TESTDIR%%/unix.sock.4;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_17%%;
-        proxy_pass   [::1]:%%PORT_5%%;
+        listen       127.0.0.1:8097;
+        proxy_pass   [::1]:%%PORT_8085%%;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_18%%;
+        listen       127.0.0.1:8098;
         proxy_pass   unix:%%TESTDIR%%/unix.sock.5;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_1%%;
-        listen       [::1]:%%PORT_0%%;
+        listen       127.0.0.1:8081;
+        listen       [::1]:%%PORT_8080%%;
         listen       unix:%%TESTDIR%%/unix.sock.0;
-        proxy_pass   127.0.0.1:%%PORT_0%%;
+        proxy_pass   127.0.0.1:8080;
         allow        all;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_4%%;
-        listen       [::1]:%%PORT_1%%;
+        listen       127.0.0.1:8084;
+        listen       [::1]:%%PORT_8081%%;
         listen       unix:%%TESTDIR%%/unix.sock.1;
-        proxy_pass   127.0.0.1:%%PORT_0%%;
+        proxy_pass   127.0.0.1:8080;
         deny         all;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_7%%;
-        listen       [::1]:%%PORT_2%%;
+        listen       127.0.0.1:8087;
+        listen       [::1]:%%PORT_8082%%;
         listen       unix:%%TESTDIR%%/unix.sock.2;
-        proxy_pass   127.0.0.1:%%PORT_0%%;
+        proxy_pass   127.0.0.1:8080;
         allow        unix:;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_10%%;
-        listen       [::1]:%%PORT_3%%;
+        listen       127.0.0.1:8090;
+        listen       [::1]:%%PORT_8083%%;
         listen       unix:%%TESTDIR%%/unix.sock.3;
-        proxy_pass   127.0.0.1:%%PORT_0%%;
+        proxy_pass   127.0.0.1:8080;
         deny         127.0.0.1;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_13%%;
-        listen       [::1]:%%PORT_4%%;
+        listen       127.0.0.1:8093;
+        listen       [::1]:%%PORT_8084%%;
         listen       unix:%%TESTDIR%%/unix.sock.4;
-        proxy_pass   127.0.0.1:%%PORT_0%%;
+        proxy_pass   127.0.0.1:8080;
         deny         ::1;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_16%%;
-        listen       [::1]:%%PORT_5%%;
+        listen       127.0.0.1:8096;
+        listen       [::1]:%%PORT_8085%%;
         listen       unix:%%TESTDIR%%/unix.sock.5;
-        proxy_pass   127.0.0.1:%%PORT_0%%;
+        proxy_pass   127.0.0.1:8080;
         deny         unix:;
     }
 }
@@ -148,7 +148,7 @@ EOF
 
 $t->try_run('no inet6 support')->plan(18);
 $t->run_daemon(\&stream_daemon);
-$t->waitforsocket('127.0.0.1:' . port(0));
+$t->waitforsocket('127.0.0.1:' . port(8080));
 
 ###############################################################################
 
@@ -156,46 +156,46 @@ my $str = 'SEE-THIS';
 
 # allow all
 
-is(stream('127.0.0.1:' . port(1))->io($str), $str, 'inet allow all');
-is(stream('127.0.0.1:' . port(2))->io($str), $str, 'inet6 allow all');
-is(stream('127.0.0.1:' . port(3))->io($str), $str, 'unix allow all');
+is(stream('127.0.0.1:' . port(8081))->io($str), $str, 'inet allow all');
+is(stream('127.0.0.1:' . port(8082))->io($str), $str, 'inet6 allow all');
+is(stream('127.0.0.1:' . port(8083))->io($str), $str, 'unix allow all');
 
 # deny all
 
-is(stream('127.0.0.1:' . port(4))->io($str), '', 'inet deny all');
-is(stream('127.0.0.1:' . port(5))->io($str), '', 'inet6 deny all');
-is(stream('127.0.0.1:' . port(6))->io($str), '', 'unix deny all');
+is(stream('127.0.0.1:' . port(8084))->io($str), '', 'inet deny all');
+is(stream('127.0.0.1:' . port(8085))->io($str), '', 'inet6 deny all');
+is(stream('127.0.0.1:' . port(8086))->io($str), '', 'unix deny all');
 
 # allow unix
 
-is(stream('127.0.0.1:' . port(7))->io($str), $str, 'inet allow unix');
-is(stream('127.0.0.1:' . port(8))->io($str), $str, 'inet6 allow unix');
-is(stream('127.0.0.1:' . port(9))->io($str), $str, 'unix allow unix');
+is(stream('127.0.0.1:' . port(8087))->io($str), $str, 'inet allow unix');
+is(stream('127.0.0.1:' . port(8088))->io($str), $str, 'inet6 allow unix');
+is(stream('127.0.0.1:' . port(8089))->io($str), $str, 'unix allow unix');
 
 # deny inet
 
-is(stream('127.0.0.1:' . port(10))->io($str), '', 'inet deny inet');
-is(stream('127.0.0.1:' . port(11))->io($str), $str, 'inet6 deny inet');
-is(stream('127.0.0.1:' . port(12))->io($str), $str, 'unix deny inet');
+is(stream('127.0.0.1:' . port(8090))->io($str), '', 'inet deny inet');
+is(stream('127.0.0.1:' . port(8091))->io($str), $str, 'inet6 deny inet');
+is(stream('127.0.0.1:' . port(8092))->io($str), $str, 'unix deny inet');
 
 # deny inet6
 
-is(stream('127.0.0.1:' . port(13))->io($str), $str, 'inet deny inet6');
-is(stream('127.0.0.1:' . port(14))->io($str), '', 'inet6 deny inet6');
-is(stream('127.0.0.1:' . port(15))->io($str), $str, 'unix deny inet6');
+is(stream('127.0.0.1:' . port(8093))->io($str), $str, 'inet deny inet6');
+is(stream('127.0.0.1:' . port(8094))->io($str), '', 'inet6 deny inet6');
+is(stream('127.0.0.1:' . port(8095))->io($str), $str, 'unix deny inet6');
 
 # deny unix
 
-is(stream('127.0.0.1:' . port(16))->io($str), $str, 'inet deny unix');
-is(stream('127.0.0.1:' . port(17))->io($str), $str, 'inet6 deny unix');
-is(stream('127.0.0.1:' . port(18))->io($str), '', 'unix deny unix');
+is(stream('127.0.0.1:' . port(8096))->io($str), $str, 'inet deny unix');
+is(stream('127.0.0.1:' . port(8097))->io($str), $str, 'inet6 deny unix');
+is(stream('127.0.0.1:' . port(8098))->io($str), '', 'unix deny unix');
 
 ###############################################################################
 
 sub stream_daemon {
 	my $server = IO::Socket::INET->new(
 		Proto => 'tcp',
-		LocalAddr => '127.0.0.1:' . port(0),
+		LocalAddr => '127.0.0.1:' . port(8080),
 		Listen => 5,
 		Reuse => 1
 	)