Mercurial > hg > nginx-tests

comparison proxy_ssl.t @ 1264:eb727c5ccef6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: adjust proxy_ssl.t connect timeout test and mark it unsafe. Previously, it could fail often on parallel execution due to the slow backend.
author Sergey Kandaurov <pluknet@nginx.com>
date Tue, 19 Dec 2017 19:56:15 +0300
parents 766bcbb632ee
children dbce8fb5f5f8
comparison
equal deleted inserted replaced
1263:ea3c7659b6c1 1264:eb727c5ccef6
63 proxy_ssl_session_reuse off; 63 proxy_ssl_session_reuse off;
64 } 64 }
65 65
66 location /timeout { 66 location /timeout {
67 proxy_pass https://127.0.0.1:8082; 67 proxy_pass https://127.0.0.1:8082;
68 proxy_connect_timeout 2s; 68 proxy_connect_timeout 3s;
69 } 69 }
70 70
71 location /timeout_h { 71 location /timeout_h {
72 proxy_pass https://127.0.0.1:8083; 72 proxy_pass https://127.0.0.1:8083;
73 proxy_connect_timeout 1s; 73 proxy_connect_timeout 1s;
108 like(http_get('/ssl'), qr/200 OK.*X-Session: \./s, 'ssl'); 108 like(http_get('/ssl'), qr/200 OK.*X-Session: \./s, 'ssl');
109 like(http_get('/ssl'), qr/200 OK.*X-Session: \./s, 'ssl 2'); 109 like(http_get('/ssl'), qr/200 OK.*X-Session: \./s, 'ssl 2');
110 like(http_get('/ssl_reuse'), qr/200 OK.*X-Session: \./s, 'ssl session new'); 110 like(http_get('/ssl_reuse'), qr/200 OK.*X-Session: \./s, 'ssl session new');
111 like(http_get('/ssl_reuse'), qr/200 OK.*X-Session: r/s, 'ssl session reused'); 111 like(http_get('/ssl_reuse'), qr/200 OK.*X-Session: r/s, 'ssl session reused');
112 like(http_get('/ssl_reuse'), qr/200 OK.*X-Session: r/s, 'ssl session reused 2'); 112 like(http_get('/ssl_reuse'), qr/200 OK.*X-Session: r/s, 'ssl session reused 2');
113
114 SKIP: {
115 skip 'long test', 1 unless $ENV{TEST_NGINX_UNSAFE};
116
113 like(http_get('/timeout'), qr/200 OK/, 'proxy connect timeout'); 117 like(http_get('/timeout'), qr/200 OK/, 'proxy connect timeout');
118
119 }
120
114 like(http_get('/timeout_h'), qr/504 Gateway/, 'proxy handshake timeout'); 121 like(http_get('/timeout_h'), qr/504 Gateway/, 'proxy handshake timeout');
115 122
116 ############################################################################### 123 ###############################################################################
117 124
118 sub http_daemon { 125 sub http_daemon {
159 166
160 $uri = $1 if $headers =~ /^\S+\s+([^ ]+)\s+HTTP/i; 167 $uri = $1 if $headers =~ /^\S+\s+([^ ]+)\s+HTTP/i;
161 next if $uri eq ''; 168 next if $uri eq '';
162 169
163 if ($uri eq '/timeout') { 170 if ($uri eq '/timeout') {
164 sleep 3; 171 sleep 4;
165 172
166 print $client <<EOF; 173 print $client <<EOF;
167 HTTP/1.1 200 OK 174 HTTP/1.1 200 OK
168 Connection: close 175 Connection: close
169 176