diff stream_upstream.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 e74a9342eb96
line wrap: on
line diff
--- a/stream_upstream.t
+++ b/stream_upstream.t
@@ -37,67 +37,67 @@ events {
 
 stream {
     upstream u {
-        server 127.0.0.1:%%PORT_4%%;
-        server 127.0.0.1:%%PORT_5%%;
+        server 127.0.0.1:8084;
+        server 127.0.0.1:8085;
     }
 
     upstream u2 {
-        server 127.0.0.1:%%PORT_6%% down;
-        server 127.0.0.1:%%PORT_6%%;
-        server 127.0.0.1:%%PORT_4%%;
-        server 127.0.0.1:%%PORT_5%%;
+        server 127.0.0.1:8086 down;
+        server 127.0.0.1:8086;
+        server 127.0.0.1:8084;
+        server 127.0.0.1:8085;
     }
 
     upstream u3 {
-        server 127.0.0.1:%%PORT_4%%;
-        server 127.0.0.1:%%PORT_5%% weight=2;
+        server 127.0.0.1:8084;
+        server 127.0.0.1:8085 weight=2;
     }
 
     upstream u4 {
-        server 127.0.0.1:%%PORT_6%%;
-        server 127.0.0.1:%%PORT_4%% backup;
+        server 127.0.0.1:8086;
+        server 127.0.0.1:8084 backup;
     }
 
     proxy_connect_timeout 1s;
 
     server {
-        listen      127.0.0.1:%%PORT_0%%;
+        listen      127.0.0.1:8080;
         proxy_pass  u;
     }
 
     server {
-        listen      127.0.0.1:%%PORT_1%%;
+        listen      127.0.0.1:8081;
         proxy_pass  u2;
     }
 
     server {
-        listen      127.0.0.1:%%PORT_2%%;
+        listen      127.0.0.1:8082;
         proxy_pass  u3;
     }
 
     server {
-        listen      127.0.0.1:%%PORT_3%%;
+        listen      127.0.0.1:8083;
         proxy_pass  u4;
     }
 }
 
 EOF
 
-$t->run_daemon(\&stream_daemon, port(4));
-$t->run_daemon(\&stream_daemon, port(5));
+$t->run_daemon(\&stream_daemon, port(8084));
+$t->run_daemon(\&stream_daemon, port(8085));
 $t->run();
 
-$t->waitforsocket('127.0.0.1:' . port(4));
-$t->waitforsocket('127.0.0.1:' . port(5));
+$t->waitforsocket('127.0.0.1:' . port(8084));
+$t->waitforsocket('127.0.0.1:' . port(8085));
 
 ###############################################################################
 
-my @ports = my ($port4, $port5) = (port(4), port(5));
+my @ports = my ($port4, $port5) = (port(8084), port(8085));
 
-is(many(30, port(0)), "$port4: 15, $port5: 15", 'balanced');
-is(many(30, port(1)), "$port4: 15, $port5: 15", 'failures');
-is(many(30, port(2)), "$port4: 10, $port5: 20", 'weight');
-is(many(30, port(3)), "$port4: 30", 'backup');
+is(many(30, port(8080)), "$port4: 15, $port5: 15", 'balanced');
+is(many(30, port(8081)), "$port4: 15, $port5: 15", 'failures');
+is(many(30, port(8082)), "$port4: 10, $port5: 20", 'weight');
+is(many(30, port(8083)), "$port4: 30", 'backup');
 
 ###############################################################################