From nobody Tue Feb 17 20:22:36 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 4fFrfh6rqXz6S252 for ; Tue, 17 Feb 2026 20:22:36 +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 4fFrfh4KYvz3nZ5 for ; Tue, 17 Feb 2026 20:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771359756; 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=7AG49b+5/2CUOhORzpEJiOf3czaRYcBA+/1W4mfpPCc=; b=g83iCQM1QBnXtLkFenR70G7Wu9x0HFBAqyKKAhaKTae2U17F1Ui0BjNc09DhfdXgKJUpyK r/P5eFMajBMRhsYyz8/dxO0JiKBxQQkPP8yCMsk0J6biR+rl2Cpq4IHclDG7LYOWPCVq1n 400s1K+UX511fowxNcPci0UfbsnUiFfzkh/hG3RhiBmuB989yghObQSrWX+svm6Tkv9Mwv F81IO+5sMJgeTNHWxiEfjPqFbvyc9ccxtHVStku5ottN6x/yNSx5dHNGlpIz5R3+PrwjvJ yXmldloLN9P+IBOuALNpti2pagldAMatIurrm6WTNKUlDeieCLnHHgMAUQAHWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771359756; a=rsa-sha256; cv=none; b=Fvks7W1g/WTf3mueVjOHkiRqJAG1dBZFnaQlMMHj/suXnKWggXjm5S6lzD9jUVEq2hSAyv /Hnj3b+foj68wUTDFXxguFx0pgJSDQEf4XDWe0IkxG6p+obbnPHraFp/F2b1SP3hHgok99 N1dAo33xJ8DIllSik4K3GQ/ecepoZA+Jlfhfzj7Mz4gSTPyfDYjnw1tygKJQ3WQ5NVMF6C g4eu2NEm92Ma6WcnIU+iSZe8X/MDgaUYzOtkPWUPEI/q4a5jMufRfyXlB6wQ+db5vnnk9e LP/xpL3qRltSIrx5TH2AWtdMiOZyeHADXbeR/1CJM44RzWnL7ybeRL9wL71hNQ== 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=1771359756; 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=7AG49b+5/2CUOhORzpEJiOf3czaRYcBA+/1W4mfpPCc=; b=Zkn1HS8B0oKiNMTlEws/aQDG84nWyEnRERALE0pXCtFtn6y8YKEBYDZgeZbVgAvu7Wf/yb /Fn0HDYHLcWYmoPvDX3zk4WKEFDFhe0vC+DbxHXUmIVF5Ygtuo+RzGuvUwEuLK3P0vc/v9 L42ojVYf3zyfItNUsjPSv5d0DlOikHfFcIqDzpwYKB+JCDmyiztqkeA9TQnTmQUo9wPbdY iK6ONqcvTU+zmEBZX4PHasASCNzzyDM80usVXNpCZBu/srI4QUZVFk4wJSITiR6X/cPLbo QpwekTLSNNegPP07gjWph8p/og4wNuyvjiIZi3YgnlC+OrH/7hE/D8M2A3Pt3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFrfh3lG2z8Zx for ; Tue, 17 Feb 2026 20:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d1ad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 20:22:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: eb425dfab19b - main - 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/main X-Git-Reftype: branch X-Git-Commit: eb425dfab19be8720cf29d560b4e778fc3531106 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 20:22:36 +0000 Message-Id: <6994ce0c.1d1ad.149e2ee4@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eb425dfab19be8720cf29d560b4e778fc3531106 commit eb425dfab19be8720cf29d560b4e778fc3531106 Author: Mark Johnston AuthorDate: 2026-02-17 17:08:34 +0000 Commit: Mark Johnston CommitDate: 2026-02-17 20:22:05 +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. --- 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 8a16316740be..159a51485c49 100755 --- a/tests/sys/netinet6/ndp.sh +++ b/tests/sys/netinet6/ndp.sh @@ -357,8 +357,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 }