diff proxy_ssl_verify.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 0af58b78df35
line wrap: on
line diff
--- a/proxy_ssl_verify.t
+++ b/proxy_ssl_verify.t
@@ -37,46 +37,46 @@ http {
     %%TEST_GLOBALS_HTTP%%
 
     server {
-        listen       127.0.0.1:%%PORT_0%%;
+        listen       127.0.0.1:8080;
         server_name  localhost;
 
         location /verify {
-            proxy_pass https://127.0.0.1:%%PORT_1%%/;
+            proxy_pass https://127.0.0.1:8081/;
             proxy_ssl_name example.com;
             proxy_ssl_verify on;
             proxy_ssl_trusted_certificate 1.example.com.crt;
         }
 
         location /wildcard {
-            proxy_pass https://127.0.0.1:%%PORT_1%%/;
+            proxy_pass https://127.0.0.1:8081/;
             proxy_ssl_name foo.example.com;
             proxy_ssl_verify on;
             proxy_ssl_trusted_certificate 1.example.com.crt;
         }
 
         location /fail {
-            proxy_pass https://127.0.0.1:%%PORT_1%%/;
+            proxy_pass https://127.0.0.1:8081/;
             proxy_ssl_name no.match.example.com;
             proxy_ssl_verify on;
             proxy_ssl_trusted_certificate 1.example.com.crt;
         }
 
         location /cn {
-            proxy_pass https://127.0.0.1:%%PORT_2%%/;
+            proxy_pass https://127.0.0.1:8082/;
             proxy_ssl_name 2.example.com;
             proxy_ssl_verify on;
             proxy_ssl_trusted_certificate 2.example.com.crt;
         }
 
         location /cn/fail {
-            proxy_pass https://127.0.0.1:%%PORT_2%%/;
+            proxy_pass https://127.0.0.1:8082/;
             proxy_ssl_name bad.example.com;
             proxy_ssl_verify on;
             proxy_ssl_trusted_certificate 2.example.com.crt;
         }
 
         location /untrusted {
-            proxy_pass https://127.0.0.1:%%PORT_2%%/;
+            proxy_pass https://127.0.0.1:8082/;
             proxy_ssl_verify on;
             proxy_ssl_trusted_certificate 1.example.com.crt;
             proxy_ssl_session_reuse off;
@@ -84,7 +84,7 @@ http {
     }
 
     server {
-        listen 127.0.0.1:%%PORT_1%% ssl;
+        listen 127.0.0.1:8081 ssl;
         server_name 1.example.com;
 
         ssl_certificate 1.example.com.crt;
@@ -94,7 +94,7 @@ http {
     }
 
     server {
-        listen 127.0.0.1:%%PORT_2%% ssl;
+        listen 127.0.0.1:8082 ssl;
         server_name 2.example.com;
 
         ssl_certificate 2.example.com.crt;