From 04b9b7138e4af55f56a82f0b3727b0e70de3a5a0 Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Thu, 11 Feb 2021 15:10:04 -0500 Subject: [PATCH 18/22] test(ipset): add missing CHECK_IPSET (cherry picked from commit 61a2f56e889f5a370e28bf98f8dcf2e864a01283) (cherry picked from commit 95f18c89e22271ec437377f8fed753997f5828aa) --- src/tests/regression/gh567.at | 1 + src/tests/regression/rhbz1779835.at | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/tests/regression/gh567.at b/src/tests/regression/gh567.at index 03c3bde4a0fe..7faa9a5b0291 100644 --- a/src/tests/regression/gh567.at +++ b/src/tests/regression/gh567.at @@ -1,5 +1,6 @@ FWD_START_TEST([rich rule source w/ mark action]) AT_KEYWORDS(gh567 rich ipset) +CHECK_IPSET FWD_CHECK([-q --permanent --new-ipset=Teste --type=hash:net]) FWD_CHECK([-q --permanent --add-rich-rule "rule family=ipv4 source ipset=Teste mark set=2"]) diff --git a/src/tests/regression/rhbz1779835.at b/src/tests/regression/rhbz1779835.at index 8de5c0353b6e..1c6738bce468 100644 --- a/src/tests/regression/rhbz1779835.at +++ b/src/tests/regression/rhbz1779835.at @@ -1,5 +1,6 @@ FWD_START_TEST([ipv6 address with brackets]) -AT_KEYWORDS(rhbz1779835 ipset zone forward_port rich) +AT_KEYWORDS(rhbz1779835 ipset) +CHECK_IPSET IF_HOST_SUPPORTS_IPV6_RULES([], [AT_SKIP_IF([:])]) @@ -10,6 +11,13 @@ FWD_CHECK([-q --permanent --new-ipset=foobar2 --type=hash:net --family=inet6]) FWD_CHECK([[-q --permanent --ipset foobar2 --add-entry='[1234::]/64']]) FWD_RELOAD +FWD_END_TEST + +FWD_START_TEST([ipv6 address with brackets]) +AT_KEYWORDS(rhbz1779835 zone forward_port rich) + +IF_HOST_SUPPORTS_IPV6_RULES([], [AT_SKIP_IF([:])]) + dnl zone source FWD_CHECK([[-q --zone internal --add-source='[::1234]']]) FWD_CHECK([[-q --zone internal --add-source='[1234::]/64']]) -- 2.27.0