diff stream_proxy_protocol_ssl.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_ssl.t
+++ b/stream_proxy_protocol_ssl.t
@@ -43,13 +43,13 @@ stream {
     proxy_protocol  on;
 
     server {
-        listen          127.0.0.1:%%PORT_0%%;
-        proxy_pass      127.0.0.1:%%PORT_1%%;
+        listen          127.0.0.1:8080;
+        proxy_pass      127.0.0.1:8081;
     }
 
     server {
-        listen          127.0.0.1:%%PORT_2%%;
-        proxy_pass      127.0.0.1:%%PORT_3%%;
+        listen          127.0.0.1:8082;
+        proxy_pass      127.0.0.1:8083;
         proxy_protocol  off;
     }
 }
@@ -74,22 +74,22 @@ foreach my $name ('localhost') {
 		or die "Can't create certificate for $name: $!\n";
 }
 
-$t->run_daemon(\&stream_daemon_ssl, port(1), path => $d, pp => 1);
-$t->run_daemon(\&stream_daemon_ssl, port(3), path => $d, pp => 0);
+$t->run_daemon(\&stream_daemon_ssl, port(8081), path => $d, pp => 1);
+$t->run_daemon(\&stream_daemon_ssl, port(8083), path => $d, pp => 0);
 $t->try_run('no stream proxy_protocol')->plan(2);
 
-$t->waitforsocket('127.0.0.1:' . port(1));
-$t->waitforsocket('127.0.0.1:' . port(3));
+$t->waitforsocket('127.0.0.1:' . port(8081));
+$t->waitforsocket('127.0.0.1:' . port(8083));
 
 ###############################################################################
 
-my $dp = port(0);
+my $dp = port(8080);
 
 my %r = pp_get('test', '127.0.0.1:' . $dp);
 is($r{'data'}, "PROXY TCP4 127.0.0.1 127.0.0.1 $r{'sp'} $dp" . CRLF . 'test',
 	'protocol on');
 
-%r = pp_get('test', '127.0.0.1:' . port(2));
+%r = pp_get('test', '127.0.0.1:' . port(8082));
 is($r{'data'}, 'test', 'protocol off');
 
 ###############################################################################