Signed-off-by: Ihar Hrachyshka <[email protected]>
---
tests/atlocal.in | 3 +++
tests/ovn-macros.at | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 9a3cf2d16..428088c41 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -174,6 +174,9 @@ find_command lftp
# Set HAVE_SCAPY
find_command scapy
+# Set HAVE_NFT
+find_command nft
+
CURL_OPT="-g -v --max-time 1 --retry 2 --retry-delay 1 --connect-timeout 1"
# Determine whether "diff" supports "normal" diffs. (busybox diff does not.)
diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
index 834ed60be..de5385620 100644
--- a/tests/ovn-macros.at
+++ b/tests/ovn-macros.at
@@ -1429,7 +1429,7 @@ stop_ovsdb_controller_updates() {
echo Stopping updates from ovn-controller to ovsdb using port $TCP_PORT
on_exit 'nft list tables | grep ovn-test && nft delete table ip ovn-test'
# Report the test as skipped if proper nft related packages are not
installed.
- AT_SKIP_IF([! which nft])
+ AT_SKIP_IF([test $HAVE_NFT = no])
AT_CHECK([nft add table ip ovn-test])
AT_CHECK([nft 'add chain ip ovn-test INPUT { type filter hook input priority
0; policy accept; }'])
AT_CHECK([nft add rule ip ovn-test INPUT tcp dport $TCP_PORT counter drop])
--
2.52.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
