sinjuginas/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REGTESTS: Replace REQUIRE_BINARIES with 'command -v'

Browse Source 
This migrates the tests to the native `feature cmd` functionality of VTest.
This commit is contained in:
Tim Duesterhus 2021-06-11 19:56:17 +02:00 committed by Willy Tarreau
parent c9570483b0
commit 4ee192f072
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reg-tests/mcli/mcli_start_progs.vtc
View File

@ -1,7 +1,7 @@
varnishtest "Try to start a master CLI with 2 programs"
#REGTEST_TYPE=bug
#REQUIRE_VERSION=2.0
#REQUIRE_BINARIES=sleep
feature cmd "command -v sleep"
feature ignore_unknown_macro

2
reg-tests/ssl/add_ssl_crt-list.vtc
View File

@ -13,7 +13,7 @@
varnishtest "Test the 'add ssl crt-list' feature of the CLI"
#REQUIRE_VERSION=2.2
#REQUIRE_OPTIONS=OPENSSL
#REQUIRE_BINARIES=socat
feature cmd "command -v socat"
feature ignore_unknown_macro
server s1 -repeat 2 {

2
reg-tests/ssl/new_del_ssl_cafile.vtc
View File

@ -11,7 +11,7 @@
varnishtest "Test the 'new ssl ca-file' and 'del ssl ca-file' commands of the CLI"
feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
#REQUIRE_BINARIES=socat
feature cmd "command -v socat"
feature ignore_unknown_macro
server s1 -repeat 2 {

2
reg-tests/ssl/new_del_ssl_crlfile.vtc
View File

@ -11,7 +11,7 @@
varnishtest "Test the 'new ssl crl-file' and 'del ssl crl-file' commands of the CLI"
feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
#REQUIRE_BINARIES=socat
feature cmd "command -v socat"
feature ignore_unknown_macro
server s1 -repeat 3 {

2
reg-tests/ssl/set_ssl_cafile.vtc
View File

@ -17,7 +17,7 @@
varnishtest "Test the 'set ssl ca-file' feature of the CLI"
feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
#REQUIRE_BINARIES=socat
feature cmd "command -v socat"
feature ignore_unknown_macro
server s1 -repeat 4 {

2
reg-tests/ssl/set_ssl_cert.vtc
View File

@ -22,7 +22,7 @@
varnishtest "Test the 'set ssl cert' feature of the CLI"
#REQUIRE_VERSION=2.2
#REQUIRE_OPTIONS=OPENSSL
#REQUIRE_BINARIES=socat
feature cmd "command -v socat"
feature ignore_unknown_macro
server s1 -repeat 9 {

2
reg-tests/ssl/set_ssl_cert_bundle.vtc
View File

@ -17,7 +17,7 @@
varnishtest "Test the 'set ssl cert' feature of the CLI with bundles"
#REQUIRE_VERSION=2.3
#REQUIRE_OPTIONS=OPENSSL
#REQUIRE_BINARIES=socat
feature cmd "command -v socat"
feature ignore_unknown_macro
server s1 -repeat 9 {

2
reg-tests/ssl/set_ssl_cert_noext.vtc
View File

@ -14,7 +14,7 @@
varnishtest "Test the 'set ssl cert' feature of the CLI with separate key and crt"
#REQUIRE_VERSION=2.2
#REQUIRE_OPTIONS=OPENSSL
#REQUIRE_BINARIES=socat
feature cmd "command -v socat"
feature ignore_unknown_macro
server s1 -repeat 3 {

2
reg-tests/ssl/set_ssl_crlfile.vtc
View File

@ -20,7 +20,7 @@
varnishtest "Test the 'set ssl crl-file' feature of the CLI"
feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
#REQUIRE_BINARIES=socat
feature cmd "command -v socat"
feature ignore_unknown_macro
server s1 -repeat 4 {

2
reg-tests/ssl/set_ssl_server_cert.vtc
View File

@ -6,7 +6,7 @@
varnishtest "Test the 'set ssl cert' feature of the CLI"
#REQUIRE_VERSION=2.4
#REQUIRE_OPTIONS=OPENSSL
#REQUIRE_BINARIES=socat
feature cmd "command -v socat"
feature ignore_unknown_macro
server s1 -repeat 4 {

2
reg-tests/ssl/show_ssl_ocspresponse.vtc
View File

@ -21,7 +21,7 @@
varnishtest "Test the 'show ssl ocsp-response' and 'show ssl cert foo.pem.ocsp' features of the CLI"
feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev0)'"
feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL)'"
#REQUIRE_BINARIES=socat
feature cmd "command -v socat"
feature ignore_unknown_macro
haproxy h1 -conf {