mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-22 04:10:48 +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.
62 lines
1.6 KiB
Plaintext
62 lines
1.6 KiB
Plaintext
varnishtest "Verify logging of relative/absolute URI path"
|
|
feature ignore_unknown_macro
|
|
|
|
#REQUIRE_VERSION=2.4
|
|
|
|
server s1 {
|
|
rxreq
|
|
txresp
|
|
} -repeat 4 -start
|
|
|
|
syslog Slg_1 -level info {
|
|
recv
|
|
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* hpo=/r/1 hp=/r/1 hu=/r/1 hq="
|
|
recv
|
|
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* hpo=/r/2 hp=/r/2 hu=/r/2\\?q=2 hq=\\?q=2"
|
|
recv
|
|
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* hpo=/r/3 hp=http://localhost/r/3 hu=http://localhost/r/3 hq="
|
|
recv
|
|
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: .* hpo=/r/4 hp=http://localhost/r/4 hu=http://localhost/r/4\\?q=4 hq=\\?q=4"
|
|
} -start
|
|
|
|
haproxy h1 -conf {
|
|
global
|
|
nbthread 1
|
|
|
|
defaults
|
|
mode http
|
|
option httplog
|
|
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
|
|
timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
|
|
timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
|
|
|
|
frontend fe1
|
|
bind "fd@${fe_1}"
|
|
log ${Slg_1_addr}:${Slg_1_port} local0
|
|
log-format "ci:%cp [%tr] hpo=%HPO hp=%HP hu=%HU hq=%HQ"
|
|
default_backend be
|
|
|
|
backend be
|
|
server app1 ${s1_addr}:${s1_port}
|
|
} -start
|
|
|
|
# The following client are started in background and synchronized
|
|
client c1 -connect ${h1_fe_1_sock} {
|
|
txreq -url "/r/1"
|
|
rxresp
|
|
expect resp.status == 200
|
|
txreq -url "/r/2?q=2"
|
|
rxresp
|
|
expect resp.status == 200
|
|
txreq -url "http://localhost/r/3" -hdr "host: localhost"
|
|
rxresp
|
|
expect resp.status == 200
|
|
txreq -url "http://localhost/r/4?q=4" -hdr "host: localhost"
|
|
rxresp
|
|
expect resp.status == 200
|
|
} -start
|
|
|
|
syslog Slg_1 -wait
|
|
|
|
client c1 -wait
|