diff stream_proxy_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 122cd3a82367
children 882267679006
line wrap: on
line diff
--- a/stream_proxy_ssl.t
+++ b/stream_proxy_ssl.t
@@ -40,14 +40,14 @@ stream {
     proxy_connect_timeout 2s;
 
     server {
-        listen      127.0.0.1:8080;
-        proxy_pass  127.0.0.1:8087;
+        listen      127.0.0.1:%%PORT_0%%;
+        proxy_pass  127.0.0.1:%%PORT_2%%;
         proxy_ssl_session_reuse off;
     }
 
     server {
-        listen      127.0.0.1:8081;
-        proxy_pass  127.0.0.1:8087;
+        listen      127.0.0.1:%%PORT_1%%;
+        proxy_pass  127.0.0.1:%%PORT_2%%;
     }
 }
 
@@ -55,7 +55,7 @@ http {
     %%TEST_GLOBALS_HTTP%%
 
     server {
-        listen       127.0.0.1:8087 ssl;
+        listen       127.0.0.1:%%PORT_2%% ssl;
         server_name  localhost;
 
         ssl_certificate_key localhost.key;
@@ -94,14 +94,12 @@ foreach my $name ('localhost') {
 
 ###############################################################################
 
-like(http_get('/', socket => getconn('127.0.0.1:8080')),
-	qr/200 OK.*X-Session: \./s, 'ssl');
-like(http_get('/', socket => getconn('127.0.0.1:8081')),
+like(http_get('/'), qr/200 OK.*X-Session: \./s, 'ssl');
+like(http_get('/', socket => getconn('127.0.0.1:' . port(1))),
 	qr/200 OK.*X-Session: \./s, 'ssl 2');
 
-like(http_get('/', socket => getconn('127.0.0.1:8080')),
-	qr/200 OK.*X-Session: \./s, 'ssl reuse session');
-like(http_get('/', socket => getconn('127.0.0.1:8081')),
+like(http_get('/'), qr/200 OK.*X-Session: \./s, 'ssl reuse session');
+like(http_get('/', socket => getconn('127.0.0.1:' . port(1))),
 	qr/200 OK.*X-Session: r/s, 'ssl reuse session 2');
 
 my $s = http('', start => 1);
@@ -116,7 +114,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";