Date: Tue, 12 May 2026 20:05:56 +0000 From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 3b16e96b005c - main - tests/ip_mroute: Remove test timeouts Message-ID: <6a038824.2147c.36d8a879@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3b16e96b005c723717aa6a4ebc48000354e64fa1 commit 3b16e96b005c723717aa6a4ebc48000354e64fa1 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2026-05-12 17:45:08 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2026-05-12 20:05:18 +0000 tests/ip_mroute: Remove test timeouts The configured timeout of 30s is a bit too low for a couple of tests which create 4+ VNET jails when running tests in parallel and with kernel sanitizers enabled. There's no reason to have custom timeouts, just use the default. MFC after: 1 week --- tests/sys/netinet/ip_mroute.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/sys/netinet/ip_mroute.py b/tests/sys/netinet/ip_mroute.py index c79b046445e5..0a705670e89b 100644 --- a/tests/sys/netinet/ip_mroute.py +++ b/tests/sys/netinet/ip_mroute.py @@ -192,7 +192,6 @@ class Test1RBasicINET(MRouteINETTestTemplate): @pytest.mark.require_user("root") @pytest.mark.require_progs(["pimd"]) - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2"]) self.waittest() @@ -287,7 +286,6 @@ class Test1RCrissCrossINET(MRouteINETCrissCrossTestTemplate): @pytest.mark.require_user("root") @pytest.mark.require_progs(["pimd"]) - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2", "vnet_host3", "vnet_host4"]) self.waittest() @@ -347,7 +345,6 @@ class Test1RCrissCrossINETMissingRouter(MRouteINETCrissCrossTestTemplate): @pytest.mark.require_user("root") @pytest.mark.require_progs(["pimd"]) - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2", "vnet_host3", "vnet_host4"]) self.waittest() @@ -401,7 +398,6 @@ class Test1RBasicINET6(MRouteINET6TestTemplate): self.donetest() @pytest.mark.require_user("root") - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2"]) self.waittest() @@ -489,7 +485,6 @@ class Test1RCrissCrossINET6MissingRouter(MRouteINET6CrissCrossTestTemplate): self.donetest() @pytest.mark.require_user("root") - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2", "vnet_host3", "vnet_host4"]) self.waittest() @@ -549,7 +544,6 @@ class Test1RCrissCrossINET6(MRouteINET6CrissCrossTestTemplate): self.donetest() @pytest.mark.require_user("root") - @pytest.mark.timeout(30) def test(self): self.starttest(["vnet_host1", "vnet_host2", "vnet_host3", "vnet_host4"]) self.waittest()home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a038824.2147c.36d8a879>