From nobody Fri Jun 6 11:17:14 2025 X-Original-To: dev-commits-src-main@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 4bDJgb0Sxwz5yCXJ; Fri, 06 Jun 2025 11:17: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 4bDJgZ54Tkz3Jr9; Fri, 06 Jun 2025 11:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749208634; 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=m5OLgOiDQoqDhEekYe9Z47SNT2QGt166gpHmOcdLyzQ=; b=YJJezaLYWZNTAdsU5YzbbKnlVH06I4pHmW7YTo09JYxcTu5xI41Ok4mB1qdi8wtaH2cc5f u1vUuDU04uqnXJQQNGVM7iyOgvTAJU7T1oPuvfOV1kCxuSMnjCUtrA41a0GHXMahuseP0F /QDivRVsZ8gLg83mkyXbgxhvrO93Sw9whJhkqVqkCCkfd22OCiEJjJcfVTL6aynUaMLs8m EZMZ22rEkQZ8iS4d7uuxSKXkxYOOpE94fW7xJCFXm7ks/Q9BIFK3unRun1fcaqJcKwwuje f+LoknPIPTj9+SPyaDYDIegNu7pOb8juHLzqpbW1qaH1QvmBGwmI2alOnZ6wHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749208634; 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=m5OLgOiDQoqDhEekYe9Z47SNT2QGt166gpHmOcdLyzQ=; b=y4nfyELqp2VYh0ucp8fwj/gU+PA+cjy1ylLDGCSg/P277aqFtJvPV1Qsri+KltVeY6ZJcv WN8KMdUfLHJVWaWTa6MIqK1X3xQqJms4YHhEO9/AH+mlWbKhO+GkqT6xYE/d5wYW1WkypG ikTYBclHLUf5oxKBOqg4ax6KlYVgzeryT2wS2YWFXVQu4OPICbfUoLaKZjUMmxEuSfYLcy q7hMWDANnj0a34ZhlhuKdwo/0WAcyl9JyLLi5ft3XqkZVo2Gkc8tebO9uJ9q9WowpSp+ot UTgU7dC05qLcGbXAC38XX++vkirG7LoiWgsw4fzlBsW1ACsRxqrRbdOmrVBwKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749208634; a=rsa-sha256; cv=none; b=H3cnfOZNH7PekvqeIa7q7vtUsqCpPIuKvvo2sllFLZYpS3zG9WqTNscd5CGfA4OsvTTTYP oKaF6VdAazcBekvbXd9l8+f75keNHvxVjBAoYSmWPDqNLU8eJf/F/qDogjWVg0VD0nJyk4 +zKGDVpvTsf0ipCQI1WBM9rtTcwbQCwQ7lV4xdBZLEgdmSLvWsT5yI6wIFotqw2yJYYNlT m12mappU7mJy9nfKvruZZK6nO3mdiuT6XoyB+d+YCUS9SZNsBgz5Uh7UCZiNjeOgggOq6L fh/qK+T7YcdFMrd/0MVS9R8Qk9VmwRoFfLjrle5pS4+DA2VlR8kx6MXoxKtnQQ== 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 4bDJgZ4RVwzsjH; Fri, 06 Jun 2025 11:17:14 +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 556BHEm5083709; Fri, 6 Jun 2025 11:17:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 556BHEU0083706; Fri, 6 Jun 2025 11:17:14 GMT (envelope-from git) Date: Fri, 6 Jun 2025 11:17:14 GMT Message-Id: <202506061117.556BHEU0083706@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: 7659d0fa2b87 - main - pf tests: skip TestHeader6::test_too_many if ipfilter is loaded List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 7659d0fa2b873374623e7582e38fb2fe92056c87 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7659d0fa2b873374623e7582e38fb2fe92056c87 commit 7659d0fa2b873374623e7582e38fb2fe92056c87 Author: Kristof Provost AuthorDate: 2025-05-27 14:19:04 +0000 Commit: Kristof Provost CommitDate: 2025-06-06 11:16:00 +0000 pf tests: skip TestHeader6::test_too_many if ipfilter is loaded IPFilter interferes with the header.py:TestHeader6::test_too_many test, so skip it if the module is loaded. Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D50661 --- tests/atf_python/utils.py | 10 ++++++++++ tests/sys/netpfil/pf/header.py | 1 + 2 files changed, 11 insertions(+) diff --git a/tests/atf_python/utils.py b/tests/atf_python/utils.py index 4bd4b642b131..26911c12aef3 100644 --- a/tests/atf_python/utils.py +++ b/tests/atf_python/utils.py @@ -46,6 +46,7 @@ class BaseTest(object): NEED_ROOT: bool = False # True if the class needs root privileges for the setup TARGET_USER = None # Set to the target user by the framework REQUIRED_MODULES: List[str] = [] + SKIP_MODULES: List[str] = [] def require_module(self, mod_name: str, skip=True): error_code = libc.modfind(mod_name) @@ -58,9 +59,18 @@ class BaseTest(object): else: raise ValueError(txt) + def skip_module(self, mod_name: str): + error_code = libc.modfind(mod_name) + if error_code == 0: + txt = "kernel module '{}' loaded, skip test".format(mod_name) + pytest.skip(txt) + return + def _check_modules(self): for mod_name in self.REQUIRED_MODULES: self.require_module(mod_name) + for mod_name in self.SKIP_MODULES: + self.skip_module(mod_name) @property def atf_vars(self) -> Dict[str, str]: diff --git a/tests/sys/netpfil/pf/header.py b/tests/sys/netpfil/pf/header.py index 71abc8e9a049..6832cfe6d42b 100644 --- a/tests/sys/netpfil/pf/header.py +++ b/tests/sys/netpfil/pf/header.py @@ -125,6 +125,7 @@ class TestHeader(VnetTestTemplate): class TestHeader6(VnetTestTemplate): REQUIRED_MODULES = [ "pf" ] + SKIP_MODULES = [ "ipfilter" ] TOPOLOGY = { "vnet1": {"ifaces": ["if1", "if2"]}, "vnet2": {"ifaces": ["if1", "if2"]},