From nobody Tue Mar 31 15:58:51 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 4flXq12C5Fz6WFBL for ; Tue, 31 Mar 2026 15:58:53 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4flXpz44FGz3gvf for ; Tue, 31 Mar 2026 15:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774972731; 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=CK8xhnhBoZ1dSkb6urI9msll3BUumuh4vCVdSEZUW2E=; b=uFZ0Z9V9n5sSFLWg8wjHujfZRVoQun0r0Ejx1xfjD9awKZcXUHdpyGNOPii+mhAyinvQwb dd2gma204QJkdgrCeHH8Pvxxw2GxEeJH+KPUTxUWfu+BqETBNxJN1QpWPFlA5B4NzV6vTT znQC3vGe6R3xSCGGv7PxE6BM/B6ZEJYozu6ZLgyJnZvv4F7j8rttFnNhUIgGLAzHe5vmbF p7EzjZzYyQHZs/o+Bm6YP1r8zt1prWBpbycOaa4RFu4n1iEwMIUbewIuRoaBNByvCRhPWn vqLl9q/xzCnH6k2rFfUStWIaOqDJLpMT2uT3sPr9UFiSfSoUh98yQqyo/fGRiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774972731; a=rsa-sha256; cv=none; b=GLzn/wakBLBsy4+fAf8B1yuOptQPe4JgVXun42xZKraK0NQkoHoshIXpU/oqDSpS4WuGc6 LqygZtnCngdytdRkV5ANj5R9lBk4/6Yf4kVxbTOT8Jels7evwkD3ThQU0qAOxpiZmhCpT7 /DNuw1lU3TOIPrp8X1CuB/ciWBev/+yNqrYD0F5Ka7LaSnzPDfSkEjvi5ynA6fjdUZa/5i L6g8wqGEBxLX2bFP9PkI9JF2mGr0kvFpp+vyi0yJB6He27BNMjzuq0WmQcmC3M00U5J0oS jSZv3UpOJy8PdgK6isJ5mfnkws82uEgZDRJuBFKHfXglXoiROBxdWUQkLZJOOw== 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=1774972731; 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=CK8xhnhBoZ1dSkb6urI9msll3BUumuh4vCVdSEZUW2E=; b=rgAcWgM3lf1KGtMTVLcR/2VIR+1rwIOjJUIVmX45ErO/+9crl3NDtvbIa3awvSXLnK72/V Cv1MXA016ncvvbWu+4sfdTiBJaEMitP71yK1p6WOrR1leUzu4G3rT9Zzn6Julr2ylGsNlH 7zqFjfyR1nT6fmoHaJ5Ym9V0JV6MLmjCqLLVafBsU4wvzM3Ma3nRz+kRbREHWPyXuhhX3G uIj7Mw2iNKosdeGRAZCxESZQHh7X4UJkK6AJ594D1+DGTSqQkYAIhbXgg4WjorSWy/Kv/x seHpTC1dHykjhIuXnwXIc3CJFOBfhef4TKIoIgvqOBdzdySK73FfIWs8FvRx2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flXpz32tqzc3d for ; Tue, 31 Mar 2026 15:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a121 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 15:58:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1a0776342682 - stable/15 - ndp tests: Fix an assertion in ndp_prefix_lifetime_extend 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1a0776342682a666b033588321dafad0987a5d42 Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 15:58:51 +0000 Message-Id: <69cbef3b.3a121.3e581af3@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1a0776342682a666b033588321dafad0987a5d42 commit 1a0776342682a666b033588321dafad0987a5d42 Author: Mark Johnston AuthorDate: 2026-02-17 17:08:34 +0000 Commit: Mark Johnston CommitDate: 2026-03-31 15:57:28 +0000 ndp tests: Fix an assertion in ndp_prefix_lifetime_extend Here we have two interface addresses sharing a v6 prefix with finite lifetime. The intent was to make sure that adding the second address didn't cause the prefix's valid lifetime to drop from 20s to 10s, but of course, while the test is running it may drop from 20s to 19s, causing the test to fail spuriously. Relax the check a bit to avoid this. PR: 293152 Fixes: 74999aac5eff ("in6: Modify address prefix lifetimes when updating address lifetimes") MFC after: 1 week Sponsored by: Klara, Inc. (cherry picked from commit eb425dfab19be8720cf29d560b4e778fc3531106) --- tests/sys/netinet6/ndp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/sys/netinet6/ndp.sh b/tests/sys/netinet6/ndp.sh index 433dd81a121b..b4c8179bcd13 100755 --- a/tests/sys/netinet6/ndp.sh +++ b/tests/sys/netinet6/ndp.sh @@ -319,8 +319,8 @@ ndp_prefix_lifetime_extend_body() { atf_fail "Unexpected lifetimes: ${t}" fi ex3=$(prefix_expiry ${prefix}/64) - if [ "${ex3}" -lt "${ex2}" ]; then - atf_fail "Expiry time was shortened: ${ex2} <= ${ex3}" + if [ "${ex3}" -le 10 -o "${ex3}" -gt 20 ]; then + atf_fail "Unexpected expiry time: ${ex3}" fi }