]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
REGTEST: fix scripts 1 and 3 to accept development version
authorWilly Tarreau <w@1wt.eu>
Fri, 16 Nov 2018 14:54:23 +0000 (15:54 +0100)
committerWilly Tarreau <w@1wt.eu>
Fri, 16 Nov 2018 14:54:23 +0000 (15:54 +0100)
These scripts were checking that the program's name was exactly "haproxy"
which clearly is not workable during development.

reg-tests/lua/b00001.vtc
reg-tests/lua/b00003.vtc

index a7a2d6991d65af997295b8c24c447a1b215a359b..213d423c151ec358eeeed7fc3d0382194d6b6d3a 100644 (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 {
index c43381a80b6b10f7c5391c865481d3f7fa538763..3f06b90a34bd4fd102bbf8a12fb7e4bec3e5d21d 100644 (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 {