mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-14 15:34:35 +00:00
f673923629
With the CI occasionally slowing down, we're starting to see again some spurious failures despite the long 1-second timeouts. This reports false positives that are disturbing and doesn't provide as much value as this could. However at this delay it already becomes a pain for developers to wait for the tests to complete. This commit adds support for the new environment variable HAPROXY_TEST_TIMEOUT that will allow anyone to modify the connect, client and server timeouts. It was set to 5 seconds by default, which should be plenty for quite some time in the CI. All relevant values that were 200ms or above were replaced by this one. A few larger values were left as they are special. One test for the set-timeout action that used to rely on a fixed 1-sec value was extended to a fixed 5-sec, as the timeout is normally not reached, but it needs to be known to compare the old and new values.
61 lines
1.7 KiB
Plaintext
61 lines
1.7 KiB
Plaintext
#commit b406b87
|
|
# BUG/MEDIUM: connection: don't store recv() result into trash.data
|
|
#
|
|
# Cyril Bonté discovered that the proxy protocol randomly fails since
|
|
# commit 843b7cb ("MEDIUM: chunks: make the chunk struct's fields match
|
|
# the buffer struct"). This is because we used to store recv()'s return
|
|
# code into trash.data which is now unsigned, so it never compares as
|
|
# negative against 0. Let's clean this up and test the result itself
|
|
# without storing it first.
|
|
|
|
varnishtest "PROXY protocol random failures"
|
|
#REQUIRE_OPTIONS=OPENSSL
|
|
|
|
feature ignore_unknown_macro
|
|
|
|
#REGTEST_TYPE=broken
|
|
|
|
syslog Slog_1 -repeat 8 -level info {
|
|
recv
|
|
expect ~ "Connect from .* to ${h1_ssl_addr}:${h1_ssl_port}"
|
|
recv
|
|
expect ~ "ssl-offload-http/http .* \"POST (https://.*:${h1_ssl_port})?/[1-8] HTTP/(2\\.0|1\\.1)\""
|
|
} -start
|
|
|
|
haproxy h1 -conf {
|
|
global
|
|
tune.ssl.default-dh-param 2048
|
|
stats bind-process 1
|
|
log ${Slog_1_addr}:${Slog_1_port} len 2048 local0 debug err
|
|
|
|
defaults
|
|
mode http
|
|
timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
|
|
timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
|
|
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
|
|
log global
|
|
|
|
listen http
|
|
bind unix@"${tmpdir}/http.socket" accept-proxy name ssl-offload-http
|
|
option forwardfor
|
|
|
|
listen ssl-offload-http
|
|
option httplog
|
|
bind "fd@${ssl}" ssl crt ${testdir}/common.pem ssl no-sslv3 alpn h2,http/1.1
|
|
server http unix@"${tmpdir}/http.socket" send-proxy
|
|
} -start
|
|
|
|
|
|
shell {
|
|
HOST=${h1_ssl_addr}
|
|
if [ "$HOST" = "::1" ] ; then
|
|
HOST="\[::1\]"
|
|
fi
|
|
for i in 1 2 3 4 5 6 7 8 ; do
|
|
urls="$urls https://$HOST:${h1_ssl_port}/$i"
|
|
done
|
|
curl -i -k -d 'x=x' $urls & wait $!
|
|
}
|
|
|
|
syslog Slog_1 -wait
|