From nobody Sat May 2 15:20:41 2026 X-Original-To: dev-commits-src-all@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 4g7BSH0Ch3z6c738 for ; Sat, 02 May 2026 15:20:47 +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 4g7BSG5Bmbz3D9L for ; Sat, 02 May 2026 15:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777735246; 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=nRWgic/Tk+vP3Oj2EJxks848MqmZcZVyaJzFF39zLNQ=; b=pdkAt4M8rhyLVLyJ/avXZmDdOt3IJQpWTBZj1ZCvXrD93zz/UjfHSiN+Z/gBXGLCkheo0k YlxcGPJl868CUjUem0Ws2PZ4o/FPrN10Vfif8lGYJZG2Ma47z0kdUgY6gREzRb2gTrvguK hSfE2wBTM6VuAvz+a330SQDSJ1YDOkyFmde4F/LaiJodtS1Oxz/F2r0dTVINYDZtqHU8aM 5Lw6PLP/c+0veZT9otCx7IHuaDQBI+YW/Vj51ZmiZJ3H5P1LkMofUYa2E+9v1HARVMvXgO 97zyQuSk+oxV6q5fKYZo9R8JdafgQByHA1DqppYxmQhDk9PYWw7QlbfbZq747w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777735246; a=rsa-sha256; cv=none; b=ykDZad2+a3B/xwHs9U26lBzVDvvyydAeNs074DxrmOhL43A2lLFBTDdEpplz14g/hNNIry 7ivKeg9N5D6BN7PZa36BGgj4/Dot0ZHc0rcDYA0YhV9t5kaNJiYLFIcghK411YrQi1J5k/ UpIqb+YeNc6kiplBRSLEi5CEfcHw0KQAK2U/stYYiERwAh9zLeroMeiUdokMA5VZ3rvZyy +mgJX6KxPf2ZmvUX7G/3Ajdh64cS/C60SNbXpxs4AZaA4a/Rp+tlEVFvANww/2Sam66IlX qBFgY/zCBV4w5kmrZ6iG6LuovW5314CoKdnN5K8h9dAma8DFmWYfcA+SCx/gBw== 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=1777735246; 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=nRWgic/Tk+vP3Oj2EJxks848MqmZcZVyaJzFF39zLNQ=; b=i8FyVubP0e61VKi8dilCz5bK6aL3a2p5uscLBQwP4T8xy4cMLrWZ061ak4FN41ziqd1da8 UXOnxnCBLcuFp6j74rRcUsZVUYMssUaQcwyjaSNlObRQID2pXDPjhQaXnmbq3AWxHuDRyc wfVtDU7LdVyjenhJO1Cc5earqe6vJFeAFaQeU/EvNZfzXUaWZGQA4FC64cPWjKRRbwAs02 69hokz4zh5xxIpNC+zUJONVutohLzw3Vffr6S7xj9Kcj161S6b0oQQ26f1DdGiNjRJNS6C cD3CUw/z7ustHSMgMmkBaMWZa361GOdCPYiM+rrArtezbYVQ3pzJGxcOw6ryDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g7BSG4nFVzrc4 for ; Sat, 02 May 2026 15:20:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c022 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 02 May 2026 15:20:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 3e845b109056 - main - ping: fix listing test cases when scapy is not installed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e845b1090565912375c5578cf0399d27b7fa70c Auto-Submitted: auto-generated Date: Sat, 02 May 2026 15:20:41 +0000 Message-Id: <69f61649.1c022.73b2a773@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=3e845b1090565912375c5578cf0399d27b7fa70c commit 3e845b1090565912375c5578cf0399d27b7fa70c Author: Alan Somers AuthorDate: 2026-05-01 23:06:35 +0000 Commit: Alan Somers CommitDate: 2026-05-02 15:20:16 +0000 ping: fix listing test cases when scapy is not installed The ATF-python test program was attempting to list test cases that require scapy. But it attempted to import the scapy module before the test cases had been listed, resulting in an ImportError that kyua interpreted as a test program crash. Fix this behavior by handling that ImportError well enough to list test cases, but not run them. If scapy isn't present, Kyua will refuse to run the test cases. But it needs to be able to list them in order to know to skip them. Sponsored by: ConnectWise MFC after: 2 weeks Reviewed by: maxim Differential Revision: https://reviews.freebsd.org/D56765 --- sbin/ping/tests/test_ping.py | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py index 3f9a3aecf924..fdf9c875329c 100644 --- a/sbin/ping/tests/test_ping.py +++ b/sbin/ping/tests/test_ping.py @@ -12,7 +12,31 @@ from typing import List from typing import Optional logging.getLogger("scapy").setLevel(logging.CRITICAL) -import scapy.all as sc +try: + import scapy.all as sc +except ImportError as e: + # Fake scapy well enough to be able to list test cases + from types import SimpleNamespace + sc = SimpleNamespace( + scapy=SimpleNamespace( + fields=SimpleNamespace( + SourceIPField=0, + ByteEnumField=0, + MultiEnumField=0, + BitField=0, + FlagsField=0, + ByteField=0, + IPField=0, + ShortField=0, + ), + layers=SimpleNamespace( + inet=SimpleNamespace( + DestIPField=0, + ICMPTimeStampField=0, + ) + ) + ) + ) def build_response_packet(echo, ip, icmp, oip_ihl, special):