diff --git a/t/014-bugs.t b/t/014-bugs.t index f0f9b91841..764f7ceb41 100644 --- a/t/014-bugs.t +++ b/t/014-bugs.t @@ -884,7 +884,7 @@ ok --- config location /t { resolver $TEST_NGINX_RESOLVER ipv6=off; - set $myhost 'localhost.'; + set $myhost '127.0.0.1.sslip.io.'; proxy_pass http://$myhost:$TEST_NGINX_RAND_PORT_1/t; } --- request diff --git a/t/024-access/on-abort.t b/t/024-access/on-abort.t index 70637ba862..a013d90998 100644 --- a/t/024-access/on-abort.t +++ b/t/024-access/on-abort.t @@ -372,7 +372,7 @@ delete thread 1 $ --- timeout: 0.2 --- abort ---- wait: 0.2 +--- wait: 1 --- ignore_response --- no_error_log [error] diff --git a/t/058-tcp-socket.t b/t/058-tcp-socket.t index d2200a4343..efb403490f 100644 --- a/t/058-tcp-socket.t +++ b/t/058-tcp-socket.t @@ -210,7 +210,7 @@ attempt to send data on a closed socket: content_by_lua ' local sock = ngx.socket.tcp() local port = $TEST_NGINX_SERVER_PORT - local ok, err = sock:connect("localhost", port) + local ok, err = sock:connect("127.0.0.1.sslip.io", port) if not ok then ngx.say("failed to connect: ", err) return @@ -218,7 +218,7 @@ attempt to send data on a closed socket: ngx.say("connected: ", ok) - local req = "GET /foo HTTP/1.0\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n" + local req = "GET /foo HTTP/1.0\\r\\nHost: 127.0.0.1.sslip.io\\r\\nConnection: close\\r\\n\\r\\n" -- req = "OK" local bytes, err = sock:send(req) @@ -256,7 +256,7 @@ attempt to send data on a closed socket: GET /t --- response_body_like connected: 1 -request sent: 57 +request sent: 66 first line received: HTTP\/1\.1 200 OK second line received: (?:Date|Server): .*? --- no_error_log diff --git a/t/128-duplex-tcp-socket.t b/t/128-duplex-tcp-socket.t index 511cc20bfc..268ec79cda 100644 --- a/t/128-duplex-tcp-socket.t +++ b/t/128-duplex-tcp-socket.t @@ -355,7 +355,7 @@ F(ngx_http_lua_socket_tcp_finalize_write_part) { --- tcp_query_len: 11 --- no_error_log [error] ---- wait: 0.05 +--- wait: 0.5 diff --git a/t/189-http2-subreq-error-wakeup.t b/t/189-http2-subreq-error-wakeup.t index 2b6adb6e19..553b806b74 100644 --- a/t/189-http2-subreq-error-wakeup.t +++ b/t/189-http2-subreq-error-wakeup.t @@ -46,6 +46,7 @@ __DATA__ --- http2 --- request GET /delay +--- curl_options: --max-time=0.9 --- timeout: 1 --- abort --- ignore_response @@ -100,6 +101,7 @@ Parent request finished, got response from subrequest --- http2 --- request GET /outer +--- curl_options: --max-time=0.9 --- timeout: 1 --- abort --- ignore_response @@ -160,6 +162,7 @@ Outer request completed --- http2 --- request GET /parallel +--- curl_options: --max-time=0.9 --- timeout: 1 --- abort --- ignore_response