The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b453e3f7554333a31496b9c748e6130017d3832f
commit b453e3f7554333a31496b9c748e6130017d3832f Author: Igor Ostapenko <[email protected]> AuthorDate: 2023-11-19 12:23:44 +0000 Commit: Kristof Provost <[email protected]> CommitDate: 2023-11-20 11:30:18 +0000 pf tests: fix name and description of divert-to cases Reflect the correct order of events for dummynet+ipdivert. --- tests/sys/netpfil/pf/divert-to.sh | 26 +++++++++++++------------- 1 file 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" }
