aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Ostapenko <pm@igoro.pro>2023-11-19 12:23:44 +0000
committerKristof Provost <kp@FreeBSD.org>2023-11-20 11:30:18 +0000
commitb453e3f7554333a31496b9c748e6130017d3832f (patch)
tree776f7e59bacfc2ae04884fcb86c15eb2454dbbc2
parent7e1affa242ca83710eb64e2c6184263fbea3deb7 (diff)
downloadsrc-b453e3f7554333a31496b9c748e6130017d3832f.tar.gz
src-b453e3f7554333a31496b9c748e6130017d3832f.zip
pf tests: fix name and description of divert-to cases
Reflect the correct order of events for dummynet+ipdivert.
-rw-r--r--tests/sys/netpfil/pf/divert-to.sh26
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/sys/netpfil/pf/divert-to.sh b/tests/sys/netpfil/pf/divert-to.sh
index 965464b35810..72adbeedb007 100644
--- a/tests/sys/netpfil/pf/divert-to.sh
+++ b/tests/sys/netpfil/pf/divert-to.sh
@@ -405,13 +405,13 @@ ipfwon_in_div_in_fwd_out_div_out_cleanup()
pft_cleanup
}
-atf_test_case "ipfwoff_in_dn_in_div_in_out_dn_out_div_out" "cleanup"
-ipfwoff_in_dn_in_div_in_out_dn_out_div_out_head()
+atf_test_case "ipfwoff_in_dn_in_div_in_out_div_out_dn_out" "cleanup"
+ipfwoff_in_dn_in_div_in_out_div_out_dn_out_head()
{
- atf_set descr 'Test inbound > delayed+diverted > outbound > delayed+diverted > outbound | network terminated'
+ atf_set descr 'Test inbound > delayed+diverted > outbound > diverted+delayed > outbound | network terminated'
atf_set require.user root
}
-ipfwoff_in_dn_in_div_in_out_dn_out_div_out_body()
+ipfwoff_in_dn_in_div_in_out_div_out_dn_out_body()
{
local ipfwon
@@ -489,22 +489,22 @@ ipfwoff_in_dn_in_div_in_out_dn_out_div_out_body()
# }
}
-ipfwoff_in_dn_in_div_in_out_dn_out_div_out_cleanup()
+ipfwoff_in_dn_in_div_in_out_div_out_dn_out_cleanup()
{
pft_cleanup
}
-atf_test_case "ipfwon_in_dn_in_div_in_out_dn_out_div_out" "cleanup"
-ipfwon_in_dn_in_div_in_out_dn_out_div_out_head()
+atf_test_case "ipfwon_in_dn_in_div_in_out_div_out_dn_out" "cleanup"
+ipfwon_in_dn_in_div_in_out_div_out_dn_out_head()
{
- atf_set descr 'Test inbound > delayed+diverted > outbound > delayed+diverted > outbound | network terminated, with ipfw enabled'
+ atf_set descr 'Test inbound > delayed+diverted > outbound > diverted+delayed > outbound | network terminated, with ipfw enabled'
atf_set require.user root
}
-ipfwon_in_dn_in_div_in_out_dn_out_div_out_body()
+ipfwon_in_dn_in_div_in_out_div_out_dn_out_body()
{
- ipfwoff_in_dn_in_div_in_out_dn_out_div_out_body "ipfwon"
+ ipfwoff_in_dn_in_div_in_out_div_out_dn_out_body "ipfwon"
}
-ipfwon_in_dn_in_div_in_out_dn_out_div_out_cleanup()
+ipfwon_in_dn_in_div_in_out_div_out_dn_out_cleanup()
{
pft_cleanup
}
@@ -524,6 +524,6 @@ atf_init_test_cases()
atf_add_test_case "ipfwoff_in_div_in_fwd_out_div_out"
atf_add_test_case "ipfwon_in_div_in_fwd_out_div_out"
- atf_add_test_case "ipfwoff_in_dn_in_div_in_out_dn_out_div_out"
- atf_add_test_case "ipfwon_in_dn_in_div_in_out_dn_out_div_out"
+ atf_add_test_case "ipfwoff_in_dn_in_div_in_out_div_out_dn_out"
+ atf_add_test_case "ipfwon_in_dn_in_div_in_out_div_out_dn_out"
}