From nobody Wed Jul 17 15:35:15 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 4WPKkq26lFz5RWCZ; Wed, 17 Jul 2024 15:35: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WPKkq13q7z4C8c; Wed, 17 Jul 2024 15:35:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721230515; 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=mRmBJ4J/X1XzpMHF3ao/NoYI7Ewvm0mD4cbHYMP2Y4Y=; b=cvLFBEit5wALm5vfh1JtLvN0I1+iJl2ukkoeZA9eLJFdab8TwxjdKorCgOGuR7OyAWx41W 2DRMCbJd/dBpPFWIJfFr7gKXPfV9EmMkxXlmQ47q5KWtyVoFQeLbHG5eoIrmnaY6oIpCBG RP45Fur2Iaq5IEcIhGrP09KJ7Aq8IVBNl7BIcngKiAFZv835vUvMvJfQgn4Vdg5zqz4sCG MflxyqpAql3Z15unOxBaBfOjEBh3yi97GZ8N4hzR5UHPhD5FrZrXIyrtyQuipm4+d8Ndbv q3Jx6Leqgr5ahUf/I76vQxdX6qzExYVwSdUfD9k2FyQEPqTJ2X85LNPdej0z2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721230515; a=rsa-sha256; cv=none; b=FMLNLBJOnQj6ozph8LolFL4CcnZYK/AFimi8QDQSgWhnuKuTwNkjYW8zEMqMNRQ+7r2f4j 5BZNPgmxvEGoP+rz7AJpqnTnsmNwWZgJHF3FN1IEdALAXknWBOszUn9h0N3stqUaogxKQM DjOa/X0LYTfZFHZg9D1UBBJCn38+TDligKv7UL82UV6SoxGV5WEiAEN+FeTbx3OsNiF0y3 VIeLe7zKQ8zM2761HJcgLOuqhuzZiloQeRNlJyxhdBTmJRYOIlGQbe90mPImE0n+3cBK9J l7uwTlLNe4vkdSxF8Qo+biDmMMncJW/9o7zv9yXtHFZh/dfET19WcQ3VJ4nG0A== 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=1721230515; 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=mRmBJ4J/X1XzpMHF3ao/NoYI7Ewvm0mD4cbHYMP2Y4Y=; b=uFIpo91oiZJX9PxFdwstmRkl5W8hYAJLIphifb65tQ2z9GKtFXoOmdrmZhs7wRJAu8Hpq3 Iorr76Ws9eoGFfvOBRg2Vf8rllkfGlUEJSjIXzYDBEQGZTIBnc7NBiHOhdYv9zgREn5uC4 +xrUyfRVyTbbEvZpBd05Ac7W/tIAQ8vfbrD1CzYmLq2MN6zEWTEgXwe0gT1JUH6vmntQmK 1x4HqEvhtU03LwF1SG3+nYd8vGWeHpg7SrQGdnRJE4Xjmh5db/3eF/Eo0JK3V5Zv6N9wDt t3//Ps8hXcVnBwhLdm1f94SFUn9aFQBqXhVEWgJDBwF/hRKlvL5jU/NmHGh4sg== 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 4WPKkq0dc1z1Phw; Wed, 17 Jul 2024 15:35:15 +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 46HFZFF2052765; Wed, 17 Jul 2024 15:35:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46HFZFoC052762; Wed, 17 Jul 2024 15:35:15 GMT (envelope-from git) Date: Wed, 17 Jul 2024 15:35:15 GMT Message-Id: <202407171535.46HFZFoC052762@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: fe0c82a603ce - main - 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/main X-Git-Reftype: branch X-Git-Commit: fe0c82a603ce069786ee81604315f499fd965546 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fe0c82a603ce069786ee81604315f499fd965546 commit fe0c82a603ce069786ee81604315f499fd965546 Author: Kristof Provost AuthorDate: 2024-07-17 13:56:49 +0000 Commit: Kristof Provost CommitDate: 2024-07-17 14:01:24 +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") --- 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"