diff stream_proxy_protocol_ssl.t @ 952:e9064d691790

Tests: converted tests to run in parallel.
author Andrey Zelenkov <zelenkov@nginx.com>
date Tue, 21 Jun 2016 16:39:13 +0300
parents f02dac68d584
children 882267679006
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:8080;
-        proxy_pass      127.0.0.1:8081;
+        listen          127.0.0.1:%%PORT_0%%;
+        proxy_pass      127.0.0.1:%%PORT_1%%;
     }
 
     server {
-        listen          127.0.0.1:8082;
-        proxy_pass      127.0.0.1:8083;
+        listen          127.0.0.1:%%PORT_2%%;
+        proxy_pass      127.0.0.1:%%PORT_3%%;
         proxy_protocol  off;
     }
 }
@@ -74,20 +74,22 @@ foreach my $name ('localhost') {
 		or die "Can't create certificate for $name: $!\n";
 }
 
-$t->run_daemon(\&stream_daemon_ssl, 8081, path => $d, pp => 1);
-$t->run_daemon(\&stream_daemon_ssl, 8083, path => $d, pp => 0);
+$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->try_run('no stream proxy_protocol')->plan(2);
 
-$t->waitforsocket('127.0.0.1:8081');
-$t->waitforsocket('127.0.0.1:8083');
+$t->waitforsocket('127.0.0.1:' . port(1));
+$t->waitforsocket('127.0.0.1:' . port(3));
 
 ###############################################################################
 
-my %r = pp_get('test');
-is($r{'data'}, "PROXY TCP4 127.0.0.1 127.0.0.1 $r{'sp'} 8080" . CRLF . 'test',
+my $dp = port(0);
+
+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:8082');
+%r = pp_get('test', '127.0.0.1:' . port(2));
 is($r{'data'}, 'test', 'protocol off');
 
 ###############################################################################
@@ -105,7 +107,7 @@ sub getconn {
 	my $peer = shift;
 	my $s = IO::Socket::INET->new(
 		Proto => 'tcp',
-		PeerAddr => $peer || '127.0.0.1:8080'
+		PeerAddr => $peer
 	)
 		or die "Can't connect to nginx: $!\n";