From nobody Thu Mar 16 17:51:51 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 4Pcvw81NrFz3yP6W; Thu, 16 Mar 2023 17:51:52 +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 4Pcvw80rzmz3x1F; Thu, 16 Mar 2023 17:51:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678989112; 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=l9FaI4YfGPUEBA6I2X7oQ55zc2oXRPi3gRgXVpiLfMI=; b=Uk0Dqswp1pobkz/7WDumlze2ZjZrEp5gRsARJGkMtwbnYnqr0NNpNgfl6M9c78urCVkcq7 27+R73YchZJwQhbbHe58p0cLH1dPhZ4/eH3UXX7ZNgwYmSN+4epeC2lYtPfsVaN5u110bo aHz2sEL1uGs7V5JYc+NsOy2YXZP2xHBeMFoxovgOVFfjNvkjKe4Q7F63vfwS3wYYNeJ6Dy DCq8/nHHp9Un1ryVlWDf5rkB6oFmOpEwszxHCK6TD0zsBpCi+U7iMNCUZaHHOfhLJxtGP5 86F2qv0oP57nbCptP9CU88ht93ptPd9YRK/9yfQ2CKJiz145FLylu5ov9pCQog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678989112; 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=l9FaI4YfGPUEBA6I2X7oQ55zc2oXRPi3gRgXVpiLfMI=; b=po4f+drobZ1S9pRImFj9IHzPAcDLQrQH+gvZ3jTqUxVLpTsbrjyaoWjwWwH1t6TxPtMAb9 NtOboNPwDJANwzvSptX3toesZpJ2bt7PMwDe6syV+0PHDwOYoD59ANvt5SrN4DgXKuqI89 vQV7YdmG2kVqYu0xqrduLAiH/fItb5nsQnP2xKPyV5Vtnb7Gcca9fE7uuCikJkquBlrHm8 0sI6cIyHjRSnM1umI6rXoqRgBEXTwHoMOW1Xcr+b+XhWmvHAQPiaMsM4+HR/u/0hseDk6u L+UxTy72QK+90HBH87G53PKHWK4eM5Bicz53fxaz+DwRy1KR4odOo/H8z0LDLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678989112; a=rsa-sha256; cv=none; b=eoBHxtRZld/eRCpoRz9sIUbwZsimGyR3GLU1B4Up8UOFvupszyE0rbHG4W/TIoXz1CVVb0 sZbT1gtBW01Qhit96OLG/4frLc8T27MWtj9ROVZ6/ayK7pcDAu6vVLIkUxKfx5NnudLtYJ nhkrDuwOkxrStZ4KdCCExaf4PaHoCt1St1swlnSQIpJiZxbQimHv38FwqiSLlwI7wUblyj j3NjhTw5aewrHNhiayuhMAoMmVY9qUKoBgQtMdpQ6iAO7qLRu1OU4zWDAF9z94bOAVAXYC WsLQFicNj87P0QOLp/rJNmCnp2NsopBpJde0HxaYBMT7PFg61kmUIGV2E9joIw== 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 4Pcvw772llzsTW; Thu, 16 Mar 2023 17:51:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32GHpp87035278; Thu, 16 Mar 2023 17:51:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32GHppdk035265; Thu, 16 Mar 2023 17:51:51 GMT (envelope-from git) Date: Thu, 16 Mar 2023 17:51:51 GMT Message-Id: <202303161751.32GHppdk035265@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a7ba32e6bcb9 - main - tun tests: Fix cleanup definitions 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7ba32e6bcb99176fdb042b9f26b2e1158d33d12 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a7ba32e6bcb99176fdb042b9f26b2e1158d33d12 commit a7ba32e6bcb99176fdb042b9f26b2e1158d33d12 Author: Mark Johnston AuthorDate: 2023-03-16 16:52:54 +0000 Commit: Mark Johnston CommitDate: 2023-03-16 17:27:24 +0000 tun tests: Fix cleanup definitions Without this, vnet jails for the tests don't get torn down. Fixes: fe701c39e8aa ("if_tun: Add basic connectivity test with nc tun support") --- tests/sys/net/if_tun_test.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/sys/net/if_tun_test.sh b/tests/sys/net/if_tun_test.sh index 5f05ac7c5eff..0e9812efddb3 100755 --- a/tests/sys/net/if_tun_test.sh +++ b/tests/sys/net/if_tun_test.sh @@ -2,13 +2,12 @@ . $(atf_get_srcdir)/../common/vnet.subr -atf_test_case "235704" "basic" "cleanup" +atf_test_case "235704" "cleanup" 235704_head() { atf_set descr "Test PR #235704" atf_set require.user root } - 235704_body() { vnet_init @@ -18,18 +17,17 @@ atf_test_case "235704" "basic" "cleanup" jexec one ifconfig ${tun} name foo atf_check -s exit:0 jexec one ifconfig foo destroy } - 235704_cleanup() { vnet_cleanup } +atf_test_case "basic" "cleanup" basic_head() { atf_set descr "Test if_tun using nc" atf_set require.user root } - basic_body() { vnet_init @@ -54,8 +52,7 @@ basic_body() atf_check -s exit:0 -o ignore \ jexec bass ping -c 1 10.100.0.1 } - -basic_clean() +basic_cleanup() { vnet_cleanup }