From da76459dc21b5af2449af2d36eb95226cb186ce2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 28 Apr 2024 11:35:11 +0200 Subject: Adding upstream version 2.6.12. Signed-off-by: Daniel Baumann --- reg-tests/mcli/mcli_show_info.vtc | 29 +++++++++++++++++++++++++++++ reg-tests/mcli/mcli_start_progs.vtc | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 reg-tests/mcli/mcli_show_info.vtc create mode 100644 reg-tests/mcli/mcli_start_progs.vtc (limited to 'reg-tests/mcli') diff --git a/reg-tests/mcli/mcli_show_info.vtc b/reg-tests/mcli/mcli_show_info.vtc new file mode 100644 index 0000000..ae533da --- /dev/null +++ b/reg-tests/mcli/mcli_show_info.vtc @@ -0,0 +1,29 @@ +varnishtest "Show info of process 1" + +#REQUIRE_VERSION=1.9 + +feature ignore_unknown_macro + +# Do nothing. Is there only to create s1_* macros +server s1 { +} -start + +haproxy h1 -W -S -conf { + defaults + mode http + timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" + timeout client "${HAPROXY_TEST_TIMEOUT-5s}" + timeout server "${HAPROXY_TEST_TIMEOUT-5s}" + + frontend myfrontend + bind "fd@${my_fe}" + default_backend test + + backend test + server www1 ${s1_addr}:${s1_port} +} -start + +haproxy h1 -mcli { + 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 new file mode 100644 index 0000000..a2e0f75 --- /dev/null +++ b/reg-tests/mcli/mcli_start_progs.vtc @@ -0,0 +1,37 @@ +varnishtest "Try to start a master CLI with 2 programs" +#REGTEST_TYPE=bug +#REQUIRE_VERSION=2.0 +feature cmd "command -v sleep" + +feature ignore_unknown_macro + +# Do nothing. Is there only to create s1_* macros +server s1 { +} -start + +haproxy h1 -W -S -conf { + defaults + mode http + timeout connect "${HAPROXY_TEST_TIMEOUT-5s}" + timeout client "${HAPROXY_TEST_TIMEOUT-5s}" + timeout server "${HAPROXY_TEST_TIMEOUT-5s}" + + frontend myfrontend + bind "fd@${my_fe}" + default_backend test + + backend test + server www1 ${s1_addr}:${s1_port} + + program foo + command sleep 10 + + program bar + command sleep 10 + +} -start + +haproxy h1 -mcli { + send "show proc" + expect ~ ".*foo.*\n.*bar.*\n" +} -wait -- cgit v1.2.3