From nobody Thu Jul 25 13:41:48 2024 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 4WVBrF3MSdz5S4mk; Thu, 25 Jul 2024 13:41:49 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WVBrF1y6Zz4S5y; Thu, 25 Jul 2024 13:41:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721914909; 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=hoL28rXNQy4zeowxkAWZsfZltEooE0VWSLR1vWEcQx0=; b=XYILwzJubafUq0eWj6vxb+f+cJIHR3+JHOtwZVwQ9h9LOlhuGjYQbMe8YtCmIdK+AuWx3X xehJcNgcuqRWPEcNodNHuRzUVG1jArt4am2pcjxCK8R3ZPYkMAMrARAqXEQ4fBbx5Bw+hJ bsW4L8zmU8TfIgtT8cKnbiN/XzY+Y0GNiHdkNlfEgfXsSWlW69wPzYyIvB7ZWGvF3UjNdA gNpdLn0uRBWVh6F9yidfVGUuuC77z8MdQSLP36iCawn184duSobyEmolPG3m7F7IwNzkuL GNpJiX9A2P98XMpH+hq/go8i3/g80AgAO1eKZGY0444AGSEkshWpwoN4eLq61Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721914909; a=rsa-sha256; cv=none; b=nxluzCE7XxwOA6ifYtcm5OKLGk9RZvSNVz4I7uFQSuOIi1SMV2+EauVlAgsu2ZMD3ba80Z vI/3aesANGI+WaQgjNnbTW498q84OX5yGLQJKWuAcNghcAG6s8hbP+agwPjJK2709GOWFV DfNGwYlt1BbdnepFCdKhLIY4lVZkIjXpLA5B5YZgeFFUuiawG6tj/bWfe+MZfRCREwZAuI My/5WVHfLZvgArvBYS7cL3K5kpfg8PCGCHXvRnyCy73q8720yaSbCO9iT8UXVYeKsCq4BK 9w0c2J/XPSvLEDsLFbmeRdVuXO+USnMO2eQosMZM5IJeyivYQ4XBbyG5hB4JZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721914909; 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=hoL28rXNQy4zeowxkAWZsfZltEooE0VWSLR1vWEcQx0=; b=XdNPpg01+AgOw/PCCllDN3wIR0dmOBSGi+D9ao4XAJtcIH1o8yX6z9ap5H7ut9+mWe8qWr Hl4IFn49zwx4Oseuz0abXnq7F6Lv4VwwcpAT2vDsLPceo1WwNJf/qfmSwPba8WB5aDfg1w sdSynbuogD2ijx4xJCnJRTWpniWu4wwyc4lZoVho6lYYtN2bAPte5xjP6fGku5pJPtjpcU 6ZwA9ZQuhYnCl6MjKhMlANmM3SR6GJHfOJZk3+b/D0Cf8WHdmc49VmCFUhTN+nxAPC8YCd I9qnEMI9kXdkYS9+4dHj5Ht/S8+yF9eDjRTpVr7H5MFT7i2+3KGv9XJhtYzHFQ== 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 4WVBrF1G0TzwbV; Thu, 25 Jul 2024 13:41:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46PDfnQt044554; Thu, 25 Jul 2024 13:41:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46PDfmC5044551; Thu, 25 Jul 2024 13:41:48 GMT (envelope-from git) Date: Thu, 25 Jul 2024 13:41:48 GMT Message-Id: <202407251341.46PDfmC5044551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 35bde8969eb6 - stable/13 - pf tests: fix sctp:timeout test 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/13 X-Git-Reftype: branch X-Git-Commit: 35bde8969eb6e63c9ca6ebdd4245588b4b8cb6c2 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=35bde8969eb6e63c9ca6ebdd4245588b4b8cb6c2 commit 35bde8969eb6e63c9ca6ebdd4245588b4b8cb6c2 Author: Kristof Provost AuthorDate: 2024-07-17 13:56:49 +0000 Commit: Kristof Provost CommitDate: 2024-07-25 08:23:38 +0000 pf tests: fix sctp:timeout test The test body somehow wound up in the cleanup function. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit fe0c82a603ce069786ee81604315f499fd965546) --- tests/sys/netpfil/pf/sctp.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/sys/netpfil/pf/sctp.sh b/tests/sys/netpfil/pf/sctp.sh index c3e1301238b0..d07d1122048b 100644 --- a/tests/sys/netpfil/pf/sctp.sh +++ b/tests/sys/netpfil/pf/sctp.sh @@ -666,11 +666,6 @@ timeout_head() timeout_body() { sctp_init -} - -timeout_cleanup() -{ - pft_cleanup vnet_mkjail timeout @@ -687,6 +682,11 @@ timeout_cleanup() jexec timeout pfctl -st } +timeout_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "basic_v4"