From nobody Thu Jul 25 13:41:49 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 4WVBrF6k0Cz5S4f8; 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 4WVBrF3yxnz4Rrt; 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=2tNrhhlCistSF+fapO6B67GZcvnjpqKOx3HPv9OQWPI=; b=LMtMltP2F4pcbl1bJnE+PavDr6qqyoi/pG9Bc7TgvnieO8ZTRDJKYpUlb6SlbgLAwfmn+Y ENCrA8uZb0YwnrA278S0B97mdK8bJLdlUCB9W740n3e5dfkKNgLe2Bm2uUn7WhpVZfgbDb Z3PZqPzOstlJX+8wHvmri3T9EraIJaHv5Ve/nMrko18L6hZtPkT6KGRN+ZziXiaHAP/5Me 4llWht64cNweX2lUd/fdeeJew2uctE+Xw0pks16A25IQawj2u4hPdZqEUb5G2UB2CsXpaY 9hY+jB94A3rOiKvGWBQkchwyyvVwnXWVSMw6raq4TS2vsOZSa5LRgmzomoSxmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721914909; a=rsa-sha256; cv=none; b=ob3HuZDCopxTdfHu9l3WQhz2B76zzec1X8Yj4BRvwZpNO5VE7qOhB/phOSP2EJZ1gxB9Dn gGJGsc1lO/9YEp8W1A3u1Ha54LUkf/IPK2H5CKXV2sQkYeCYAXTP7V/Y9EGYZLTcCWXlSg TCX+lmlpHkKIyNkAeZebVdKEqiNQTbLiKR3ZClM1x5MHXe2prFmVTHPdfTgNQEv3Tdv4do eEdEJ8hxwAo3LdbQs1R+YtyK3PO/FAFPRH/hhBfaTUsnoeKwIeKnrLgMwAZZSoODC3RWH/ ZY1ejCsrVLIVUodeA8MrhRZg5NWejNRxa83cEV6454ld9D1FnmnKcIyryy9+Xw== 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=2tNrhhlCistSF+fapO6B67GZcvnjpqKOx3HPv9OQWPI=; b=iunV6NcrObtjmHZy4mSxYhJ0TlPPEKnu00hRc5mzaNoXfVlCSMCp03R8z5qbt2h4kp7ij8 DigvqEIAk+zA+6llobjT0qrVjpT7j0Bnio06rJc89BAZTuABFqo9yWNff8/P/ODAAZH2V6 TW9CLNEXc0R7tiE4hSBBVf5FWLIm1otF2drabMs7/1RCiT1da3CLiF5E7tEAOF2vxeMWwJ grfTy2OS5meAfX2C8PKLU2q4Uk8xkVkHpZsPOvmQtz/M1Th3+2KPk/v0OxZPAJ+hewAY9I IQDjE61ELWwokuIxlSDDde3X9yYpPXrDZDHSrsoQbZZXsgiCsSQKJFyy9icrtg== 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 4WVBrF3M78zx08; 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 46PDfnP1044597; 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 46PDfnK5044594; Thu, 25 Jul 2024 13:41:49 GMT (envelope-from git) Date: Thu, 25 Jul 2024 13:41:49 GMT Message-Id: <202407251341.46PDfnK5044594@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: 4f5440f2abe9 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 4f5440f2abe9f3250b7852399ecfc1af51084373 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4f5440f2abe9f3250b7852399ecfc1af51084373 commit 4f5440f2abe9f3250b7852399ecfc1af51084373 Author: Kristof Provost AuthorDate: 2024-07-17 13:56:49 +0000 Commit: Kristof Provost CommitDate: 2024-07-25 08:23:31 +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"