diff 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 4606a2ec3d7c
line wrap: on
line diff
--- a/ssl.t
+++ b/ssl.t
@@ -48,8 +48,8 @@ http {
     ssl_session_tickets off;
 
     server {
-        listen       127.0.0.1:%%PORT_5%% ssl;
-        listen       127.0.0.1:%%PORT_0%%;
+        listen       127.0.0.1:8085 ssl;
+        listen       127.0.0.1:8080;
         server_name  localhost;
 
         ssl_certificate_key inner.key;
@@ -74,7 +74,7 @@ http {
     }
 
     server {
-        listen      127.0.0.1:%%PORT_1%%;
+        listen      127.0.0.1:8081;
         server_name  localhost;
 
         # Special case for enabled "ssl" directive.
@@ -89,7 +89,7 @@ http {
     }
 
     server {
-        listen      127.0.0.1:%%PORT_2%% ssl;
+        listen      127.0.0.1:8082 ssl;
         server_name  localhost;
 
         ssl_session_cache builtin:1000;
@@ -100,7 +100,7 @@ http {
     }
 
     server {
-        listen      127.0.0.1:%%PORT_3%% ssl;
+        listen      127.0.0.1:8083 ssl;
         server_name  localhost;
 
         ssl_session_cache none;
@@ -111,7 +111,7 @@ http {
     }
 
     server {
-        listen      127.0.0.1:%%PORT_4%% ssl;
+        listen      127.0.0.1:8084 ssl;
         server_name  localhost;
 
         ssl_session_cache off;
@@ -150,39 +150,39 @@ my $ctx = new IO::Socket::SSL::SSL_Conte
 
 ###############################################################################
 
-like(http_get('/reuse', socket => get_ssl_socket($ctx, port(5))),
+like(http_get('/reuse', socket => get_ssl_socket($ctx, port(8085))),
 	qr/^body \.$/m, 'shared initial session');
-like(http_get('/reuse', socket => get_ssl_socket($ctx, port(5))),
+like(http_get('/reuse', socket => get_ssl_socket($ctx, port(8085))),
 	qr/^body r$/m, 'shared session reused');
 
-like(http_get('/', socket => get_ssl_socket($ctx, port(1))), qr/^body \.$/m,
+like(http_get('/', socket => get_ssl_socket($ctx, port(8081))), qr/^body \.$/m,
 	'builtin initial session');
-like(http_get('/', socket => get_ssl_socket($ctx, port(1))), qr/^body r$/m,
+like(http_get('/', socket => get_ssl_socket($ctx, port(8081))), qr/^body r$/m,
 	'builtin session reused');
 
-like(http_get('/', socket => get_ssl_socket($ctx, port(2))), qr/^body \.$/m,
+like(http_get('/', socket => get_ssl_socket($ctx, port(8082))), qr/^body \.$/m,
 	'builtin size initial session');
-like(http_get('/', socket => get_ssl_socket($ctx, port(2))), qr/^body r$/m,
+like(http_get('/', socket => get_ssl_socket($ctx, port(8082))), qr/^body r$/m,
 	'builtin size session reused');
 
-like(http_get('/', socket => get_ssl_socket($ctx, port(3))), qr/^body \.$/m,
+like(http_get('/', socket => get_ssl_socket($ctx, port(8083))), qr/^body \.$/m,
 	'reused none initial session');
-like(http_get('/', socket => get_ssl_socket($ctx, port(3))), qr/^body \.$/m,
+like(http_get('/', socket => get_ssl_socket($ctx, port(8083))), qr/^body \.$/m,
 	'session not reused 1');
 
-like(http_get('/', socket => get_ssl_socket($ctx, port(4))), qr/^body \.$/m,
+like(http_get('/', socket => get_ssl_socket($ctx, port(8084))), qr/^body \.$/m,
 	'reused off initial session');
-like(http_get('/', socket => get_ssl_socket($ctx, port(4))), qr/^body \.$/m,
+like(http_get('/', socket => get_ssl_socket($ctx, port(8084))), qr/^body \.$/m,
 	'session not reused 2');
 
 # ssl certificate inheritance
 
-my $s = get_ssl_socket($ctx, port(1));
+my $s = get_ssl_socket($ctx, port(8081));
 like($s->dump_peer_certificate(), qr/CN=localhost/, 'CN');
 
 $s->close();
 
-$s = get_ssl_socket($ctx, port(5));
+$s = get_ssl_socket($ctx, port(8085));
 like($s->dump_peer_certificate(), qr/CN=inner/, 'CN inner');
 
 $s->close();
@@ -191,24 +191,24 @@ like($s->dump_peer_certificate(), qr/CN=
 
 select undef, undef, undef, 2.1;
 
-like(http_get('/', socket => get_ssl_socket($ctx, port(1))), qr/^body \.$/m,
+like(http_get('/', socket => get_ssl_socket($ctx, port(8081))), qr/^body \.$/m,
 	'session timeout');
 
 # embedded variables
 
 my ($sid) = http_get('/id',
-	socket => get_ssl_socket($ctx, port(5))) =~ /^body (\w+)$/m;
+	socket => get_ssl_socket($ctx, port(8085))) =~ /^body (\w+)$/m;
 is(length $sid, 64, 'session id');
 
 unlike(http_get('/id'), qr/body \w/, 'session id no ssl');
 
-like(http_get('/cipher', socket => get_ssl_socket($ctx, port(5))),
+like(http_get('/cipher', socket => get_ssl_socket($ctx, port(8085))),
 	qr/^body [\w-]+$/m, 'cipher');
 
-like(http_get('/client_verify', socket => get_ssl_socket($ctx, port(5))),
+like(http_get('/client_verify', socket => get_ssl_socket($ctx, port(8085))),
 	qr/^body NONE$/m, 'client verify');
 
-like(http_get('/protocol', socket => get_ssl_socket($ctx, port(5))),
+like(http_get('/protocol', socket => get_ssl_socket($ctx, port(8085))),
 	qr/^body (TLS|SSL)v(\d|\.)+$/m, 'protocol');
 
 ###############################################################################