diff stream_udp_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_udp_limit_conn.t
+++ b/stream_udp_limit_conn.t
@@ -41,34 +41,34 @@ stream {
     proxy_timeout    1s;
 
     server {
-        listen           127.0.0.1:%%PORT_1_UDP%% udp;
-        proxy_pass       127.0.0.1:%%PORT_0_UDP%%;
+        listen           127.0.0.1:%%PORT_8081_UDP%% udp;
+        proxy_pass       127.0.0.1:%%PORT_8080_UDP%%;
 
         limit_conn       zone 1;
         proxy_responses  2;
     }
 
     server {
-        listen           127.0.0.1:%%PORT_2_UDP%% udp;
-        proxy_pass       127.0.0.1:%%PORT_0_UDP%%;
+        listen           127.0.0.1:%%PORT_8082_UDP%% udp;
+        proxy_pass       127.0.0.1:%%PORT_8080_UDP%%;
         limit_conn       zone2 1;
     }
 
     server {
-        listen           127.0.0.1:%%PORT_3_UDP%% udp;
-        proxy_pass       127.0.0.1:%%PORT_0_UDP%%;
+        listen           127.0.0.1:%%PORT_8083_UDP%% udp;
+        proxy_pass       127.0.0.1:%%PORT_8080_UDP%%;
         limit_conn       zone 5;
     }
 
     server {
-        listen           127.0.0.1:%%PORT_4_UDP%% udp;
-        proxy_pass       127.0.0.1:%%PORT_1_UDP%%;
+        listen           127.0.0.1:%%PORT_8084_UDP%% udp;
+        proxy_pass       127.0.0.1:%%PORT_8081_UDP%%;
         limit_conn       zone2 1;
     }
 
     server {
-        listen           127.0.0.1:%%PORT_5_UDP%% udp;
-        proxy_pass       127.0.0.1:%%PORT_1_UDP%%;
+        listen           127.0.0.1:%%PORT_8085_UDP%% udp;
+        proxy_pass       127.0.0.1:%%PORT_8081_UDP%%;
         limit_conn       zone 1;
     }
 }
@@ -77,13 +77,13 @@ EOF
 
 $t->try_run('no stream udp')->plan(9);
 $t->run_daemon(\&udp_daemon, $t);
-$t->waitforfile($t->testdir . '/' . port(0));
+$t->waitforfile($t->testdir . '/' . port(8080));
 
 ###############################################################################
 
 # same and other zones
 
-my $s = dgram('127.0.0.1:' . port(1));
+my $s = dgram('127.0.0.1:' . port(8081));
 
 is($s->io('1'), '1', 'passed');
 
@@ -91,21 +91,21 @@ is($s->io('1'), '1', 'passed');
 # in same socket will be treated as new connection
 
 is($s->io('1', read_timeout => 0.1), '', 'rejected new connection');
-is(dgram('127.0.0.1:' . port(1))->io('1', read_timeout => 0.1), '',
+is(dgram('127.0.0.1:' . port(8081))->io('1', read_timeout => 0.1), '',
 	'rejected same zone');
-is(dgram('127.0.0.1:' . port(2))->io('1'), '1', 'passed different zone');
-is(dgram('127.0.0.1:' . port(3))->io('1'), '1', 'passed same zone unlimited');
+is(dgram('127.0.0.1:' . port(8082))->io('1'), '1', 'passed different zone');
+is(dgram('127.0.0.1:' . port(8083))->io('1'), '1', 'passed same zone unlimited');
 
 sleep 1;	# waiting for proxy_timeout to expire
 
 is($s->io('2', read => 2), '12', 'new connection after proxy_timeout');
 
-is(dgram('127.0.0.1:' . port(1))->io('2', read => 2), '12', 'passed 2');
+is(dgram('127.0.0.1:' . port(8081))->io('2', read => 2), '12', 'passed 2');
 
 # zones proxy chain
 
-is(dgram('127.0.0.1:' . port(4))->io('1'), '1', 'passed proxy');
-is(dgram('127.0.0.1:' . port(5))->io('1', read_timeout => 0.1), '',
+is(dgram('127.0.0.1:' . port(8084))->io('1'), '1', 'passed proxy');
+is(dgram('127.0.0.1:' . port(8085))->io('1', read_timeout => 0.1), '',
 	'rejected proxy');
 
 ###############################################################################
@@ -115,14 +115,14 @@ sub udp_daemon {
 
 	my $server = IO::Socket::INET->new(
 		Proto => 'udp',
-		LocalAddr => '127.0.0.1:' . port(0),
+		LocalAddr => '127.0.0.1:' . port(8080),
 		Reuse => 1,
 	)
 		or die "Can't create listening socket: $!\n";
 
 	# signal we are ready
 
-	open my $fh, '>', $t->testdir() . '/' . port(0);
+	open my $fh, '>', $t->testdir() . '/' . port(8080);
 	close $fh;
 
 	while (1) {