diff stream_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 f4189a38c3a4
children 882267679006
line wrap: on
line diff
--- a/stream_ssl.t
+++ b/stream_ssl.t
@@ -53,32 +53,32 @@ stream {
     ssl_password_file password_http;
 
     server {
-        listen      127.0.0.1:8080 ssl;
-        proxy_pass  127.0.0.1:8081;
+        listen      127.0.0.1:%%PORT_0%% ssl;
+        proxy_pass  127.0.0.1:%%PORT_1%%;
 
         ssl_session_cache builtin;
         ssl_password_file password;
     }
 
     server {
-        listen      127.0.0.1:8082 ssl;
-        proxy_pass  127.0.0.1:8081;
+        listen      127.0.0.1:%%PORT_2%% ssl;
+        proxy_pass  127.0.0.1:%%PORT_1%%;
 
         ssl_session_cache off;
         ssl_password_file password_many;
     }
 
     server {
-        listen      127.0.0.1:8083 ssl;
-        proxy_pass  127.0.0.1:8081;
+        listen      127.0.0.1:%%PORT_3%% ssl;
+        proxy_pass  127.0.0.1:%%PORT_1%%;
 
         ssl_session_cache builtin:1000;
         ssl_password_file password_fifo;
     }
 
     server {
-        listen      127.0.0.1:8084 ssl;
-        proxy_pass  127.0.0.1:8081;
+        listen      127.0.0.1:%%PORT_4%% ssl;
+        proxy_pass  127.0.0.1:%%PORT_1%%;
 
         ssl_session_cache shared:SSL:1m;
         ssl_certificate_key inherits.key;
@@ -123,48 +123,48 @@ fork() || exec("echo localhost > $d/pass
 $t->run_daemon(\&http_daemon);
 $t->run();
 
-$t->waitforsocket('127.0.0.1:8081');
+$t->waitforsocket('127.0.0.1:' . port(1));
 
 ###############################################################################
 
 my ($s, $ssl, $ses);
 
-($s, $ssl) = get_ssl_socket(8080);
+($s, $ssl) = get_ssl_socket(port(0));
 Net::SSLeay::write($ssl, "GET / HTTP/1.0$CRLF$CRLF");
 like(Net::SSLeay::read($ssl), qr/200 OK/, 'ssl');
 
 # ssl_session_cache
 
-($s, $ssl) = get_ssl_socket(8080);
+($s, $ssl) = get_ssl_socket(port(0));
 $ses = Net::SSLeay::get_session($ssl);
 
-($s, $ssl) = get_ssl_socket(8080, $ses);
+($s, $ssl) = get_ssl_socket(port(0), $ses);
 is(Net::SSLeay::session_reused($ssl), 1, 'builtin session reused');
 
-($s, $ssl) = get_ssl_socket(8082);
+($s, $ssl) = get_ssl_socket(port(2));
 $ses = Net::SSLeay::get_session($ssl);
 
-($s, $ssl) = get_ssl_socket(8082, $ses);
+($s, $ssl) = get_ssl_socket(port(2), $ses);
 isnt(Net::SSLeay::session_reused($ssl), 1, 'session not reused');
 
-($s, $ssl) = get_ssl_socket(8083);
+($s, $ssl) = get_ssl_socket(port(3));
 $ses = Net::SSLeay::get_session($ssl);
 
-($s, $ssl) = get_ssl_socket(8083, $ses);
+($s, $ssl) = get_ssl_socket(port(3), $ses);
 is(Net::SSLeay::session_reused($ssl), 1, 'builtin size session reused');
 
-($s, $ssl) = get_ssl_socket(8084);
+($s, $ssl) = get_ssl_socket(port(4));
 $ses = Net::SSLeay::get_session($ssl);
 
-($s, $ssl) = get_ssl_socket(8084, $ses);
+($s, $ssl) = get_ssl_socket(port(4), $ses);
 is(Net::SSLeay::session_reused($ssl), 1, 'shared session reused');
 
 # ssl_certificate inheritance
 
-($s, $ssl) = get_ssl_socket(8080);
+($s, $ssl) = get_ssl_socket(port(0));
 like(Net::SSLeay::dump_peer_certificate($ssl), qr/CN=localhost/, 'CN');
 
-($s, $ssl) = get_ssl_socket(8084);
+($s, $ssl) = get_ssl_socket(port(4));
 like(Net::SSLeay::dump_peer_certificate($ssl), qr/CN=inherits/, 'CN inner');
 
 ###############################################################################
@@ -174,7 +174,7 @@ sub get_ssl_socket {
 	my $s;
 
 	my $dest_ip = inet_aton('127.0.0.1');
-	my $dest_serv_params = sockaddr_in($port || 8080, $dest_ip);
+	my $dest_serv_params = sockaddr_in($port, $dest_ip);
 
 	socket($s, &AF_INET, &SOCK_STREAM, 0) or die "socket: $!";
 	connect($s, $dest_serv_params) or die "connect: $!";
@@ -191,7 +191,7 @@ sub get_ssl_socket {
 sub http_daemon {
 	my $server = IO::Socket::INET->new(
 		Proto => 'tcp',
-		LocalHost => '127.0.0.1:8081',
+		LocalHost => '127.0.0.1:' . port(1),
 		Listen => 5,
 		Reuse => 1
 	)