From nobody Mon Nov 20 13:05:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SYnmW0hJJz51GTM; Mon, 20 Nov 2023 13:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SYnmW0064z3crJ; Mon, 20 Nov 2023 13:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700485515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x2zmzCaiD3CmL3MDGEtsILP0Gf2AWNuEa2A0Zw/UdwI=; b=kYTdB9zckBbmOFXT00rkWCLWo47ZOKGMOQTV8Y6NPRNAbaPNBMF4jDxnt9C163EL9R3kK6 DUtU2SJzvKEVmc+vbfxZofFv5s8BY9wmRtDwSJJNv3kfevPObzhCcvSX7vENjSzzutAdmy AP9kZ3Bk0DUvU1/i+6prfCjKQKHKLeZN596f3tOyWTLjJKi6LMh+Bm11ceEhJuvdxHcTGM mhpLOg8OAnqr6a+qURme+6JD44Q/tDeSP4mWCzExqvEuPyv1x5JKs68I6R5JP8Zaqg/iaM Jj5oC6F1pP/xlTIUOB6+OXLAxYBaq1gRO2TR3si1NRmE8sVHuyfunFwb5+I1iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700485515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x2zmzCaiD3CmL3MDGEtsILP0Gf2AWNuEa2A0Zw/UdwI=; b=bcsgnsP00Jt2FingA4ZBEX2vvLyAbAiiM7DjMepM7ZiQJ6oD6L559WH/NY115qFcj/la7i t9ZoX/OvFf6cXG+pDhi4qg04rPSEw7DB5CVVzb9DOixS82qrSSODkgr2TL6uoyHLr7AAcc NVIPvrZV0ZDqTGJClwNck8n822IxTGlOULrlPRLCiaNEL4rj0ZolzMtdXeOl+cT8XK6IZ4 WnqslL9O+we7ciZApoFXVcJtq16HYA4T6oiAIlWHqUQCbrSuvMkjwAyyS8eyNhPMdrX6g0 1ZGjt2gQ3ga5m/pytXUxXg97Nv27znjr/2Iv4LDg7qp7RBpfT4A5o3P4N3HGEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700485515; a=rsa-sha256; cv=none; b=NGB+QpI131lufBqGEitVfXGNZjSjN+Z8lCowfTN+7p52zDCB4h5LdsmaWd3HqHQnRybnET BNvYTlHv0jpP/baW0cRGM66OiVro1ajSMlXCF/gfrs9u/qoZ88WPMSYGc2Ird7kIu5lzwt UPKCZoQi42iF9amfLITiaYKBw/D0tIvtpQFtBRko2Xz1Zuuhh3T6gJ4ELHg6Vx4DaTHIxd h8FXzMu+bU23CDB23F0pcUkBRETFWhUZXae7esORkkT10cA/d1TnsfKxV83VxHHHsjUY98 GI8jdTs+iwAM2xNEWUhFyhs4YBlfV6S/m3OfZ4zfn8y5bTGvaWaS0YjThEtzig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SYnmV5wLPzt69; Mon, 20 Nov 2023 13:05:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AKD5EPb089941; Mon, 20 Nov 2023 13:05:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AKD5Ev8089938; Mon, 20 Nov 2023 13:05:14 GMT (envelope-from git) Date: Mon, 20 Nov 2023 13:05:14 GMT Message-Id: <202311201305.3AKD5Ev8089938@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: b453e3f75543 - main - pf tests: fix name and description of divert-to cases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b453e3f7554333a31496b9c748e6130017d3832f Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b453e3f7554333a31496b9c748e6130017d3832f commit b453e3f7554333a31496b9c748e6130017d3832f Author: Igor Ostapenko AuthorDate: 2023-11-19 12:23:44 +0000 Commit: Kristof Provost 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" }