Skip to content

Commit c388943

Browse files
committed
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.
1 parent a5c7d11 commit c388943

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

proxy_ssl.t

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ http {
6565
6666
location /timeout {
6767
proxy_pass https://127.0.0.1:8082;
68-
proxy_connect_timeout 2s;
68+
proxy_connect_timeout 3s;
6969
}
7070
7171
location /timeout_h {
@@ -110,7 +110,14 @@ like(http_get('/ssl'), qr/200 OK.*X-Session: \./s, 'ssl 2');
110110
like(http_get('/ssl_reuse'), qr/200 OK.*X-Session: \./s, 'ssl session new');
111111
like(http_get('/ssl_reuse'), qr/200 OK.*X-Session: r/s, 'ssl session reused');
112112
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+
113117
like(http_get('/timeout'), qr/200 OK/, 'proxy connect timeout');
118+
119+
}
120+
114121
like(http_get('/timeout_h'), qr/504 Gateway/, 'proxy handshake timeout');
115122

116123
###############################################################################
@@ -161,7 +168,7 @@ sub http_daemon {
161168
next if $uri eq '';
162169

163170
if ($uri eq '/timeout') {
164-
sleep 3;
171+
sleep 4;
165172

166173
print $client <<EOF;
167174
HTTP/1.1 200 OK

0 commit comments

Comments
 (0)