diff stream_limit_conn.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_limit_conn.t
+++ b/stream_limit_conn.t
@@ -37,32 +37,32 @@ stream {
     limit_conn_zone  $binary_remote_addr  zone=zone2:1m;
 
     server {
-        listen           127.0.0.1:%%PORT_0%%;
-        proxy_pass       127.0.0.1:%%PORT_4%%;
+        listen           127.0.0.1:8080;
+        proxy_pass       127.0.0.1:8084;
         limit_conn       zone 1;
     }
 
     server {
-        listen           127.0.0.1:%%PORT_5%%;
-        proxy_pass       127.0.0.1:%%PORT_4%%;
+        listen           127.0.0.1:8085;
+        proxy_pass       127.0.0.1:8084;
         limit_conn       zone 5;
     }
 
     server {
-        listen           127.0.0.1:%%PORT_1%%;
-        proxy_pass       127.0.0.1:%%PORT_4%%;
+        listen           127.0.0.1:8081;
+        proxy_pass       127.0.0.1:8084;
         limit_conn       zone2 1;
     }
 
     server {
-        listen           127.0.0.1:%%PORT_2%%;
-        proxy_pass       127.0.0.1:%%PORT_0%%;
+        listen           127.0.0.1:8082;
+        proxy_pass       127.0.0.1:8080;
         limit_conn       zone2 1;
     }
 
     server {
-        listen           127.0.0.1:%%PORT_3%%;
-        proxy_pass       127.0.0.1:%%PORT_0%%;
+        listen           127.0.0.1:8083;
+        proxy_pass       127.0.0.1:8080;
         limit_conn       zone 1;
     }
 }
@@ -71,7 +71,7 @@ http {
     %%TEST_GLOBALS_HTTP%%
 
     server {
-        listen       127.0.0.1:%%PORT_4%%;
+        listen       127.0.0.1:8084;
         server_name  localhost;
 
         location / { }
@@ -96,8 +96,8 @@ EOF
 ok($s, 'long connection');
 
 is(get(), undef, 'rejected same zone');
-like(get('127.0.0.1:' . port(1)), qr/200 OK/, 'passed different zone');
-like(get('127.0.0.1:' . port(5)), qr/200 OK/, 'passed same zone unlimited');
+like(get('127.0.0.1:' . port(8081)), qr/200 OK/, 'passed different zone');
+like(get('127.0.0.1:' . port(8085)), qr/200 OK/, 'passed same zone unlimited');
 
 ok(http(<<EOF, socket => $s), 'long connection closed');
 Host: localhost
@@ -106,8 +106,8 @@ EOF
 
 # zones proxy chain
 
-like(get('127.0.0.1:' . port(2)), qr/200 OK/, 'passed proxy');
-is(get('127.0.0.1:' . port(3)), undef, 'rejected proxy');
+like(get('127.0.0.1:' . port(8082)), qr/200 OK/, 'passed proxy');
+is(get('127.0.0.1:' . port(8083)), undef, 'rejected proxy');
 
 ###############################################################################
 
@@ -126,7 +126,7 @@ sub getconn {
 	my $peer = shift;
 	my $s = IO::Socket::INET->new(
 		Proto => 'tcp',
-		PeerAddr => $peer || '127.0.0.1:' . port(0)
+		PeerAddr => $peer || '127.0.0.1:' . port(8080)
 	)
 		or die "Can't connect to nginx: $!\n";