From nobody Thu May 21 14:22:58 2026 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 4gLrGp6FPlz6f6xR for ; Thu, 21 May 2026 14:22:58 +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 4gLrGp5GzBz3KVy for ; Thu, 21 May 2026 14:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779373378; 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=0MugVOEEUoDU1w/pM2IHaZFddnnmAsKpMcBu8+roQMI=; b=kaT2DJxC0aInLWASO8mwjV9zy9918jCbHoM475iTo81wso6nnJu/KBoyky7JliJyObU+tl lygUR2TUc+AUYR53hdsU6H87lcm3mFAoyjcW3ZnoAy5NJrJqYUGnYRie/D5+f0IqVj01Vn 4qXXD1Ue+RKDlFwlbOwiGbcjxqEVsMXinLsSSpWXjNPs/09OXJ4et9UURBDmCa9sWO5P10 P/4BPC/ZnjtsvOvMTagSyc1yUdglH7n2eNSQii/FA0CMD1+2rIJx/r0wHta5GoeG6kAVVb i/FVkklmB1CiurOGxmaZFNJf/qPOZ7gU4yBgI0BgcPkTnSq7tYj2Hso/483RMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779373378; a=rsa-sha256; cv=none; b=dFse/QGHr16JO2g1yZJo0Qf9yRjY1RdgLV+L3+ma/ovoci64MNdMD3OScF1BQNSb48Crjh ClPdywrHSjPmcGNZfucMr5F5tEEEP0yUKcp4UCXk5sDr4gMdRcrk95ecN0ZwnEKQt8zBy2 Hogffd0gUk6U43Vx/XYUoadh+tm+CFMc6y9H5jkI6Wt8AciSpueUpsKk1C3JSH25DUiZNC iRHMfBrLnDrqEz4yCawEKpAw49dVSiQfEhiQCjGtlm/7ECdhbqAhRjVhTHPU2ol1HCc45f 9BOg5Otr6T2ANUv8zAyIPT5F+wwTE7MV5FWKoqPyd0lzGtC6RkmY7H3JR6xZcw== 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=1779373378; 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=0MugVOEEUoDU1w/pM2IHaZFddnnmAsKpMcBu8+roQMI=; b=US+2hE+FowvLaF2O3H6/vDuU3dlRVSFgFBs9+Vsm6JZdfUyYZdLT61vrlSA5SCv2JjbHc8 JiNqkP7hkMQqYO4yW3EwxrSMe1CKKlSnbUugxH2hN40RVX78tfw64V+ONyc0t7jl7+9J1h 8HQzrwUih2L5a3MP5OUCxNZrl8Bnyf4gEf6immF5avCWa47rrl3JwLgj492JtK4fnWuQCd MUNlMIDXMJ2aBYICKmlEgH3UkS+Ht+VR/7gfd0CG0//IBcsR05oXYuU4AyLpBMrKABfITq YyPlYy383vbFN9KbcihjnENi6tRrWn0neO5nAmhKXvNVBIOveYlIjity5qCaSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gLrGp4b0czcZp for ; Thu, 21 May 2026 14:22:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c070 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 21 May 2026 14:22:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Siva Mahadevan Subject: git: a8c74d6c64df - main - tests/ndp: fix ndp_routeinfo_option testcase flakiness 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8c74d6c64dfddae95b9c6d48a8ea82b7c4d7b25 Auto-Submitted: auto-generated Date: Thu, 21 May 2026 14:22:58 +0000 Message-Id: <6a0f1542.3c070.7612e5f2@gitrepo.freebsd.org> The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=a8c74d6c64dfddae95b9c6d48a8ea82b7c4d7b25 commit a8c74d6c64dfddae95b9c6d48a8ea82b7c4d7b25 Author: Siva Mahadevan AuthorDate: 2026-05-21 14:22:22 +0000 Commit: Siva Mahadevan CommitDate: 2026-05-21 14:22:22 +0000 tests/ndp: fix ndp_routeinfo_option testcase flakiness Since we are sleeping for an indefinite period of time waiting for the default route to appear, the expire times may be gone past 1+ seconds, causing the Expire column to show <1800 or <600. Fixes: f6bcc0925f0ea838da5183dc503f847e56d15cc8 Reviewed by: pouria Approved by: lwhsu (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D56712 --- tests/sys/netinet6/ndp.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/sys/netinet6/ndp.sh b/tests/sys/netinet6/ndp.sh index 35ea6655d922..636a5558b7a8 100755 --- a/tests/sys/netinet6/ndp.sh +++ b/tests/sys/netinet6/ndp.sh @@ -834,11 +834,16 @@ ndp_routeinfo_option_body() { done # Make sure routes from rti option are being installed - atf_check -s exit:0 \ - -o match:"^${route1}/32[[:space:]]+${lladdr}.*1800" \ - -o match:"^${route2}/48[[:space:]]+${lladdr}.*600" \ - -o match:"^default[[:space:]]+${lladdr}" \ - jexec ${jname} netstat -rn6 + atf_check -s exit:0 -o save:netstat_out netstat -j ${jname} -rn6 + atf_check -s exit:0 -o match:"^default[[:space:]]+${lladdr}" \ + cat netstat_out + + # Ensure that route1's and route2's expiration times are correct + # respectively and do not get swapped + expire1="$(grep "^${route1}/32[[:space:]]*${lladdr}" netstat_out | cut -wf5)" + atf_check -s exit:0 test 601 -le ${expire1} -a ${expire1} -le 1800 + expire2="$(grep "^${route2}/48[[:space:]]*${lladdr}" netstat_out | cut -wf5)" + atf_check -s exit:0 test ${expire2} -le 600 # Verify the default route lifetime and its preference is overwrited atf_check -s exit:0 \