From nobody Tue May 19 14:08:50 2026 X-Original-To: dev-commits-src-branches@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 4gKc3R26yJz6fFvM for ; Tue, 19 May 2026 14:08:51 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gKc3R0PjLz3hMr for ; Tue, 19 May 2026 14:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779199731; 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=29Tak6WI8+gC5J6D3I0lX0Qx8Gr5d+BpzJQPSl9J9Xo=; b=OUPjX13OnxmkRVbUi6l28N1ypCLvc1ywIjYxpuw7SMTniOwXdlXbAvZhQEuAqckvSEnoip gGS9zDXk0dgIF95aVDsEG6bq5zBZC3iEOktlz8opKPDyELpff2fIMwPuKhcyDMfGg+JA4x DFNZe9xXKsv4aWZwgDQGFuFI/FvGn9to7Cz7cHM5/wSQUiiRabyYcPe58SInWgUyfZjnmH VImpzNKTZXYgXXXaOmRbrhDVqbhY/+XLeHT/YWV756h4jJLBFuMQU8UXbkYEP7hGQjb3zk fJz02AFyeiLD2c+J4WAZZSV4Yhf4VQ/OTI+2vG6+OWBO5EmF5gzOD4BAXmXMJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779199731; a=rsa-sha256; cv=none; b=FLRycv+JIt7zwznv/lMs24oYmlexYSDfCGobKAG8RR9KNQWeglMz+qmOYwwhKOQrYDzGA4 H4ZLLL1DKdThWx/TEuHwaJYag85BDoO7BZfBcESKdt/gp1QCNmQiYWlvwJRHW6k6er/xxw JWbnMpF7sXKDanz47fEdvHvq8ZUvx2sE110cyKU+zUmq+X2MCvC6JC2qic6dPx6q65eDkP iHrDOXiZNkrjrPeQ3sAljw6cBhBNjdLIe2ZW4Su4R9NZijB+M0mceAFhU3B26m3C53M1E9 v241d2koSpHdivGJe4SBlNbFK/Lsxz9vA/5/c6l2yj1uZsdIX6q5bbfaMWw/tA== 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=1779199731; 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=29Tak6WI8+gC5J6D3I0lX0Qx8Gr5d+BpzJQPSl9J9Xo=; b=HgpXX+H+hLo1aoFLEivKY3AhVxcej5rNxYkv7ooIQwMzdPT/PcvJ2Apq03pcYNyvogFwC6 H81zT1Y4+PUSivGBvU8/BipIc2AlUz3QkhltSS6oBFOM7fLye6vwZglb6eFtTsyL1adtD4 A2B97RUJkKp5TpVQYGZQ83Skr5zoRtZebh8kq6qv1osrsvGTg9ip+TzLfGdwY0GS8nH+Au pprdBg4L0xWTT+BGELwbUqiVMfi9izSq6xR7+f45NMzyJF8A3PVGYEAVpIG6Fd+WceGftn Fw7THV1fBOe64x8KvfkHVDZZlPotvIrcOXaHat1e9b+N2rUCvNGfP60nCBc6ZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gKc3Q6qPnz32V for ; Tue, 19 May 2026 14:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cc01 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 19 May 2026 14:08:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5478353afa3e - stable/15 - tests/ip_mroute: Remove test timeouts List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 5478353afa3e4bba4f054b6cfd8b061f6e7b951a Auto-Submitted: auto-generated Date: Tue, 19 May 2026 14:08:50 +0000 Message-Id: <6a0c6ef2.3cc01.450306f0@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5478353afa3e4bba4f054b6cfd8b061f6e7b951a commit 5478353afa3e4bba4f054b6cfd8b061f6e7b951a Author: Mark Johnston AuthorDate: 2026-05-12 17:45:08 +0000 Commit: Mark Johnston CommitDate: 2026-05-19 14:08:32 +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 (cherry picked from commit 3b16e96b005c723717aa6a4ebc48000354e64fa1) --- 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()