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.
74 lines
2.1 KiB
Plaintext
74 lines
2.1 KiB
Plaintext
#commit 271022150d7961b9aa39dbfd88e0c6a4bc48c3ee
|
|
# BUG/MINOR: map: fix map_regm with backref
|
|
#
|
|
# Due to a cascade of get_trash_chunk calls the sample is
|
|
# corrupted when we want to read it.
|
|
#
|
|
# The fix consist to use a temporary chunk to copy the sample
|
|
# value and use it.
|
|
|
|
varnishtest "map_regm get_trash_chunk test"
|
|
feature ignore_unknown_macro
|
|
|
|
#REGTEST_TYPE=bug
|
|
|
|
syslog S1 -level notice {
|
|
recv info
|
|
# not expecting ${h1_pid} with master-worker
|
|
expect ~ "[^:\\[ ]\\[[[:digit:]]+\\]: .* fe1 be1/s1 [[:digit:]]+/[[:digit:]]+/[[:digit:]]+/[[:digit:]]+/[[:digit:]]+ 200 [[:digit:]]+ - - ---- .* \"GET / HTTP/(1|2)(\\.1)?\""
|
|
} -start
|
|
|
|
server s1 {
|
|
rxreq
|
|
expect req.method == "GET"
|
|
expect req.http.x-mapped-from-header == example_AND_org
|
|
expect req.http.x-mapped-from-var == example_AND_org
|
|
txresp
|
|
|
|
rxreq
|
|
expect req.method == "GET"
|
|
expect req.http.x-mapped-from-header == www.example_AND_org
|
|
expect req.http.x-mapped-from-var == www.example_AND_org
|
|
txresp
|
|
} -start
|
|
|
|
haproxy h1 -conf {
|
|
global
|
|
log ${S1_addr}:${S1_port} local0 debug err
|
|
|
|
defaults
|
|
mode http
|
|
log global
|
|
option httplog
|
|
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
|
|
timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
|
|
timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
|
|
|
|
frontend fe1
|
|
bind "fd@${fe1}"
|
|
# Remove port from Host header
|
|
http-request replace-value Host '(.*):.*' '\1'
|
|
# Store host header in variable
|
|
http-request set-var(txn.host) req.hdr(Host)
|
|
# This works correctly
|
|
http-request set-header X-Mapped-From-Header %[req.hdr(Host),map_regm(${testdir}/map_regm_with_backref.map,"unknown")]
|
|
# This breaks before commit 271022150d7961b9aa39dbfd88e0c6a4bc48c3ee
|
|
http-request set-header X-Mapped-From-Var %[var(txn.host),map_regm(${testdir}/map_regm_with_backref.map,"unknown")]
|
|
|
|
default_backend be1
|
|
|
|
backend be1
|
|
server s1 ${s1_addr}:${s1_port}
|
|
} -start
|
|
|
|
client c1 -connect ${h1_fe1_sock} {
|
|
txreq -hdr "Host: example.org:8443"
|
|
rxresp
|
|
expect resp.status == 200
|
|
|
|
txreq -hdr "Host: www.example.org"
|
|
rxresp
|
|
expect resp.status == 200
|
|
} -run
|
|
|