Wr0OKvi/HVJXVUxeB2aGh7XgYmwd1ZlKHOuhSSUYgs amOMeVPap9LdCqrn/QuBIwe/cxlK4ym18u6g62JXOmQ+kUVdAMSW7raE3YyKoNLpAhYz8i hWRTo83iHiyEEiv2JPRD2mkXmEY9qdTHkSBTvEWRDX0nxEpQ54Jf42fkH9L/L1ejF8bg0O NdolewW8IaYS9WRpYl4JMcbBMxdek7yvWhzhT6GMaFfFG8VJ6iT+4UFBV8a9FIbj+cVLV4 YL4Un4vGhvdwbRuudx0tMtDhGKj1DlCjjKwe0hWNZCyiAkmmovam+F11kVAtOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739371488; a=rsa-sha256; cv=none; b=IBB0n2NLl43sdqOiquXacBDIorizhPDlrPfLQizsgTyb0WmDoSOTw0z+O7SeKeOCCbRGQ/ yEkFIoau1wXR8QN73ncjpU8eeGpDUoySorKDmkqQz+Fj0cfm6/lZwd69g0zExVrF2krjVl Sem8+K2sd1TXI/u2KKNgLnYVYXoKjy4u4ZvBjzjc/UFMj1lw8c2VcKwavYN7kv/2jcsJ4l aKCrh3kINXMYf4vGvOAEpGk79iGkAVq7lj/dH3v18VuE9zifwvuQlWAWRR93GrGvsphAQF 1TcWW6ZZeXIRBVAiH7dXg2D1YP47mnsCXFh6PTOSE8i4rOkcUAM5OwB1hfu2dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YtLgg6rVmz13Fy; Wed, 12 Feb 2025 14:44:47 +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 51CEilo8016909; Wed, 12 Feb 2025 14:44:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CEiljl016906; Wed, 12 Feb 2025 14:44:47 GMT (envelope-from git) Date: Wed, 12 Feb 2025 14:44:47 GMT Message-Id: <202502121444.51CEiljl016906@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 50f18a9b26c3 - main - netinet tests: Move import 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50f18a9b26c3431848de94bd1217786dd695f6dd Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=50f18a9b26c3431848de94bd1217786dd695f6dd commit 50f18a9b26c3431848de94bd1217786dd695f6dd Author: Jose Luis Duran AuthorDate: 2025-02-12 14:38:09 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-12 14:38:09 +0000 netinet tests: Move import Move the import of 'Sniffer', which depends on scapy into the test so we don't try (and fail) to import it unless scapy is installed. Reviewed by: kp, emaste Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D48945 --- tests/sys/netinet/igmp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/netinet/igmp.py b/tests/sys/netinet/igmp.py index b079c5d18664..4a4e67211bd7 100644 --- a/tests/sys/netinet/igmp.py +++ b/tests/sys/netinet/igmp.py @@ -36,7 +36,6 @@ logging.getLogger("scapy").setLevel(logging.CRITICAL) curdir = os.path.dirname(os.path.realpath(__file__)) netpfil_common = curdir + "/../netpfil/common" sys.path.append(netpfil_common) -from sniffer import Sniffer sc = None sp = None @@ -87,6 +86,7 @@ class TestIGMP(VnetTestTemplate): if1 = self.vnet.iface_alias_map["if1"] # Start a background sniff + from sniffer import Sniffer expected_pkt = { "type": "join", "group": "230.0.0.1" } sniffer = Sniffer(expected_pkt, check_igmpv3, if1.name, timeout=10)