From 6834b65d091d1173e36033cdf5c05b7a235698bd Mon Sep 17 00:00:00 2001
From: Eric Garver <eric@garver.life>
Date: Tue, 3 Sep 2019 12:57:29 -0400
Subject: [PATCH 99/99] fix: tests/regression/rhbz1723610: make deterministic
Use --query-rule. The --get-all-rules output is not necessarily in any
defined order.
Fixes: 0220c8584512 ("fix: tests/regression/rhbz1723610: better coverage")
(cherry picked from commit 441a4ef405b869b4c68bbbac21f001814578df08)
(cherry picked from commit 3a634eb266f60bc8419f5e3d37abd425e2d4dff5)
---
src/tests/regression/rhbz1723610.at | 35 +++++++++++++----------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/tests/regression/rhbz1723610.at b/src/tests/regression/rhbz1723610.at
index 70eb226cb6df..0d0810cc8623 100644
--- a/src/tests/regression/rhbz1723610.at
+++ b/src/tests/regression/rhbz1723610.at
@@ -4,31 +4,28 @@ AT_KEYWORDS(direct rhbz1723610 gh385)
FWD_CHECK([-q --permanent --direct --add-rule ipv4 filter OUTPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT])
FWD_CHECK([-q --permanent --direct --add-rule ipv4 filter INPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT])
FWD_CHECK([-q --permanent --direct --add-rule ipv4 filter INPUT 0 -d 127.0.0.2 -p tcp --dport 22 -j ACCEPT])
-FWD_CHECK([--permanent --direct --get-all-rules], 0, [dnl
-ipv4 filter OUTPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT
-ipv4 filter INPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT
-ipv4 filter INPUT 0 -d 127.0.0.2 -p tcp --dport 22 -j ACCEPT
-])
+FWD_CHECK([-q --permanent --direct --query-rule ipv4 filter OUTPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT], 0)
+FWD_CHECK([-q --permanent --direct --query-rule ipv4 filter INPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT], 0)
+FWD_CHECK([-q --permanent --direct --query-rule ipv4 filter INPUT 0 -d 127.0.0.2 -p tcp --dport 22 -j ACCEPT], 0)
FWD_RELOAD
-FWD_CHECK([--direct --get-all-rules], 0, [dnl
-ipv4 filter OUTPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT
-ipv4 filter INPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT
-ipv4 filter INPUT 0 -d 127.0.0.2 -p tcp --dport 22 -j ACCEPT
-])
+FWD_CHECK([-q --direct --query-rule ipv4 filter OUTPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT], 0)
+FWD_CHECK([-q --direct --query-rule ipv4 filter INPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT], 0)
+FWD_CHECK([-q --direct --query-rule ipv4 filter INPUT 0 -d 127.0.0.2 -p tcp --dport 22 -j ACCEPT], 0)
FWD_CHECK([-q --permanent --direct --remove-rules ipv6 filter INPUT])
FWD_CHECK([-q --permanent --direct --remove-rules ipv4 filter INPUT])
-FWD_CHECK([--permanent --direct --get-all-rules], 0, [dnl
-ipv4 filter OUTPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT
-])
+FWD_CHECK([-q --permanent --direct --query-rule ipv4 filter OUTPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT], 0)
+FWD_CHECK([-q --permanent --direct --query-rule ipv4 filter INPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT], 1)
+FWD_CHECK([-q --permanent --direct --query-rule ipv4 filter INPUT 0 -d 127.0.0.2 -p tcp --dport 22 -j ACCEPT], 1)
FWD_RELOAD
-FWD_CHECK([--direct --get-all-rules], 0, [dnl
-ipv4 filter OUTPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT
-])
+FWD_CHECK([-q --direct --query-rule ipv4 filter OUTPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT], 0)
+FWD_CHECK([-q --direct --query-rule ipv4 filter INPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT], 1)
+FWD_CHECK([-q --direct --query-rule ipv4 filter INPUT 0 -d 127.0.0.2 -p tcp --dport 22 -j ACCEPT], 1)
FWD_CHECK([-q --direct --add-rule ipv4 filter INPUT 0 -p tcp --dport 22 -j ACCEPT])
FWD_CHECK([-q --direct --remove-rules ipv4 filter OUTPUT])
-FWD_CHECK([--direct --get-all-rules], 0, [dnl
-ipv4 filter INPUT 0 -p tcp --dport 22 -j ACCEPT
-])
+FWD_CHECK([-q --direct --query-rule ipv4 filter INPUT 0 -p tcp --dport 22 -j ACCEPT], 0)
+FWD_CHECK([-q --direct --query-rule ipv4 filter OUTPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT], 1)
+FWD_CHECK([-q --direct --query-rule ipv4 filter INPUT 0 -d 127.0.0.1 -p tcp --dport 22 -j ACCEPT], 1)
+FWD_CHECK([-q --direct --query-rule ipv4 filter INPUT 0 -d 127.0.0.2 -p tcp --dport 22 -j ACCEPT], 1)
FWD_END_TEST
--
2.20.1