git: adbe6e6435a2 - main - Reenable vnet tests in CI

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Thu, 05 May 2022 19:14:55 UTC
The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=adbe6e6435a2d6021d90532d1fc9c6e89db0742a

commit adbe6e6435a2d6021d90532d1fc9c6e89db0742a
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-05-03 22:18:34 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2022-05-05 18:38:08 +0000

    Reenable vnet tests in CI
    
    After restoring the associated commits the tests can be enabled again.
    
    This reverts commit 711524d961233cd017ee0fd17e4b87013720f1c8.
    This reverts commit c4585b938a04dfb157d7a10fa958be13415145be.
    
    PR:             263767
---
 tests/sys/common/vnet.subr          | 4 ----
 tests/sys/netpfil/common/utils.subr | 2 --
 2 files changed, 6 deletions(-)

diff --git a/tests/sys/common/vnet.subr b/tests/sys/common/vnet.subr
index 930260b41693..cdd3d3f69709 100644
--- a/tests/sys/common/vnet.subr
+++ b/tests/sys/common/vnet.subr
@@ -13,10 +13,6 @@ unlist_interface()
 
 vnet_init()
 {
-	if [ "$(atf_config_get ci false)" = "true" ]; then
-		atf_skip "https://bugs.freebsd.org/263767"
-	fi
-
 	if [ "`sysctl -i -n kern.features.vimage`" != 1 ]; then
 		atf_skip "This test requires VIMAGE"
 	fi
diff --git a/tests/sys/netpfil/common/utils.subr b/tests/sys/netpfil/common/utils.subr
index e41cc67413ab..43cd856b2e87 100644
--- a/tests/sys/netpfil/common/utils.subr
+++ b/tests/sys/netpfil/common/utils.subr
@@ -111,8 +111,6 @@ dummynet_init()
 		atf_skip "This test requires dummynet"
 	fi
 
-	atf_skip "Skip to avoid dummynet_send() panic after interface removal."
-
 	case $firewall in
 	ipfw|pf)
 		# Nothing. This is okay.