RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-23 13:17:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

REGTEST: fix scripts 1 and 3 to accept development version

Browse Source 
These scripts were checking that the program's name was exactly "haproxy"
which clearly is not workable during development.
This commit is contained in:
Willy Tarreau 2018-11-16 15:54:23 +01:00
parent d5016469bf
commit 9c27ea0a6a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
reg-tests/lua/b00001.vtc
View File

@ -25,16 +25,16 @@ feature ignore_unknown_macro
syslog Slog {
recv notice
expect ~ "haproxy\\[[0-9]*\\]: Proxy f1 started"
expect ~ "[^:\\[ ]*\\[[0-9]*\\]: Proxy f1 started"
recv notice
expect ~ "haproxy\\[[0-9]*\\]: Proxy f2 started"
expect ~ "[^:\\[ ]\\[[0-9]*\\]: Proxy f2 started"
recv info
expect ~ "haproxy\\[[0-9]*\\]: Ta=[0-9]* Tc=[0-9]* Td=[0-9]* Th=[0-9]* Ti=[0-9]* Tq=[0-9]* TR=[0-9]* Tr=[0-9]* Tt=[0-9]* Tw=[0-9]*$"
expect ~ "[^:\\[ ]\\[[0-9]*\\]: Ta=[0-9]* Tc=[0-9]* Td=[0-9]* Th=[0-9]* Ti=[0-9]* Tq=[0-9]* TR=[0-9]* Tr=[0-9]* Tt=[0-9]* Tw=[0-9]*$"
recv info
expect ~ "haproxy\\[[0-9]*\\]: Tc=[0-9]* Td=[0-9]* Th=[0-9]* Tt=[0-9]* Tw=[0-9]*$"
expect ~ "[^:\\[ ]\\[[0-9]*\\]: Tc=[0-9]* Td=[0-9]* Th=[0-9]* Tt=[0-9]* Tw=[0-9]*$"
} -start
haproxy h1 -conf {

2
reg-tests/lua/b00003.vtc
View File

@ -19,7 +19,7 @@ feature ignore_unknown_macro
syslog Slog -level info -repeat 100 {
recv info
expect ~ "haproxy\\[${h1_pid}\\]: Ta=[0-9]* Tc=[0-9]* Td=-1 Th=[0-9]* Ti=[0-9]* Tq=[0-9]* TR=[0-9] Tr=-1 Tt=[0-9]* Tw=[0-9]*"
expect ~ "[^:\\[ ]\\[${h1_pid}\\]: Ta=[0-9]* Tc=[0-9]* Td=-1 Th=[0-9]* Ti=[0-9]* Tq=[0-9]* TR=[0-9] Tr=-1 Tt=[0-9]* Tw=[0-9]*"
} -start
haproxy h1 -conf {