REGTESTS: cli: add delay 0.1 before connect to cli

When vtest starts haproxy process, it loops until the moment, when haproxy
pidfile is created. When pidfile is created, vtest considers that haproxy
process is ready and it starts to perform test commands, in particular, it
connects to CLI. It's not very reliable approach to base the check of the
process readiness on the PID file. After master-worker architecture
refactoring pidfile is created in the early init stage, but master and worker
are not yet finished its initialization routines. So, all mcli tests and some
tests where we sent commands to CLI start to fail regularly.

In vtest at the moment there is no any other approach to check that the
process is really ready. So let's add a delay 0.1s before connecting to CLI in
all mcli tests and in acl_cli_spaces test.

diff --git a/reg-tests/http-rules/acl_cli_spaces.vtc b/reg-tests/http-rules/acl_cli_spaces.vtc
index 334133d919f6b909041e90cf302a36ce33515aad..81b7b0dcf413ec817dceb92828949694676e2ccc 100644 (file)
--- a/reg-tests/http-rules/acl_cli_spaces.vtc
+++ b/reg-tests/http-rules/acl_cli_spaces.vtc
@@ -33,6 +33,7 @@ client c1 -connect ${h1_fe1_sock} {
 } -run
 
 haproxy h1 -cli {
+  delay 0.1
   send "add acl ${testdir}/agents.acl Mon\\ User\\ Agent\\;"
   expect ~ .*
 
@@ -48,6 +49,7 @@ client c1 -connect ${h1_fe1_sock} {
 
 
 haproxy h1 -cli {
+  delay 0.1
   send "del acl ${testdir}/agents.acl Mon\\ User\\ Agent\\;"
   expect ~ .*
 
@@ -64,6 +66,7 @@ client c1 -connect ${h1_fe1_sock} {
 
 # Try it with the master CLI
 haproxy h1 -mcli {
+  delay 0.1
   send "@1 add acl ${testdir}/agents.acl Mon\\ User\\ Agent\\;;@1 show acl ${testdir}/agents.acl"
   expect ~ ".*Mon User Agent;.*"
 }

diff --git a/reg-tests/mcli/mcli_debug_dev.vtc b/reg-tests/mcli/mcli_debug_dev.vtc
index beab61604778a0e54475f62731a19802b89bd0f9..147ff0dc7ded983911ff1a57ec2a0d242b3ca67b 100644 (file)
--- a/reg-tests/mcli/mcli_debug_dev.vtc
+++ b/reg-tests/mcli/mcli_debug_dev.vtc
@@ -38,6 +38,7 @@ haproxy h1 -W -S -conf {
 } -start
 
 haproxy h1 -mcli {
+    delay 0.1
     send "@1; expert-mode on; debug dev log Victory"
     expect ~ ".*"
 } -wait

diff --git a/reg-tests/mcli/mcli_show_info.vtc b/reg-tests/mcli/mcli_show_info.vtc
index 3c44461a77ae21f4bc7e76cf3f76dfdd9654ae2a..276488a1b8b731de6c0c61c93ea210cdf16e80e1 100644 (file)
--- a/reg-tests/mcli/mcli_show_info.vtc
+++ b/reg-tests/mcli/mcli_show_info.vtc
@@ -22,6 +22,7 @@ haproxy h1 -W -S -conf {
 } -start
 
 haproxy h1 -mcli {
+    delay 0.1
     send "@1 show info"
     expect ~ ".*\nProcess_num: 1\n.*"
 } -wait

diff --git a/reg-tests/mcli/mcli_start_progs.vtc b/reg-tests/mcli/mcli_start_progs.vtc
index 51b335ce5ea23b6421b0ea6c103ae62b9ec31442..c812288e01964989253860124f131e67f6a3a5bc 100644 (file)
--- a/reg-tests/mcli/mcli_start_progs.vtc
+++ b/reg-tests/mcli/mcli_start_progs.vtc
@@ -31,6 +31,7 @@ haproxy h1 -W -S -conf {
 } -start
 
 haproxy h1 -mcli {
+    delay 0.1
     send "show proc"
     expect ~ ".*foo.*\n.*bar.*\n"
 } -wait