diff ssl_password_file.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 90a0d85436c1
line wrap: on
line diff
--- a/ssl_password_file.t
+++ b/ssl_password_file.t
@@ -54,8 +54,8 @@ http {
     ssl_password_file password_http;
 
     server {
-        listen       127.0.0.1:%%PORT_1%% ssl;
-        listen       127.0.0.1:%%PORT_0%%;
+        listen       127.0.0.1:8081 ssl;
+        listen       127.0.0.1:8080;
         server_name  localhost;
 
         ssl_password_file password;
@@ -66,21 +66,21 @@ http {
     }
 
     server {
-        listen       127.0.0.1:%%PORT_0%%;
+        listen       127.0.0.1:8080;
         server_name  two_entries;
 
         ssl_password_file password_many;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_0%%;
+        listen       127.0.0.1:8080;
         server_name  file_is_fifo;
 
         ssl_password_file password_fifo;
     }
 
     server {
-        listen       127.0.0.1:%%PORT_0%%;
+        listen       127.0.0.1:8080;
         server_name  inherits;
 
         ssl_certificate_key inherits.key;
@@ -148,7 +148,7 @@ sub get_ssl_socket {
 		alarm(2);
 		$s = IO::Socket::SSL->new(
 			Proto => 'tcp',
-			PeerAddr => '127.0.0.1:' . port(1),
+			PeerAddr => '127.0.0.1:' . port(8081),
 			SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE(),
 			SSL_error_trap => sub { die $_[1] }
 		);