From nobody Fri Apr 25 21:05:52 2025 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 4Zklk83Klpz5v447; Fri, 25 Apr 2025 21:05:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zklk82dksz3ZGW; Fri, 25 Apr 2025 21:05:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745615152; 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=/aWP05ifZajt0YFkdeW9DKvEwhaE4poqZOk1W+11mFM=; b=dosE3UxqOaADhCiJbTVwogSBfxQca/KyxHsnwa7965Qb7tjmJ83vPSLLJqWflL2pVzVCXM XO9hZG7bynXeuSvvbn4d+ZbSFtb3oe1C1lPuLJZNIKJxK4pI6zRz8+MMxeKJu3w3wSbVaW ol2l6uxAUtfGu5/NTT84L698gW70pOaCjCx3cbxnu9/XzhhIrtEOo+skQIPB2I9JX4A0Fm fsII14cwSmOuPnfVc+PKuyM0W5HDyrG9N8WiYcmZcRBwZ1LZDQlDD4sgiP7cCmzGBbGcTZ 3juKiXuKLBqi3NT0O4rqmgYX/DRJOkrooXAIyn/7dZ4hEo+MEdjzvNlWYE6u5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745615152; a=rsa-sha256; cv=none; b=nqF+c0ms4y0bwhEOARYZ/WHAq2P0US4SyrJtpOpMgTbLreKvNwzsy4xwYMXLw6SK8YWrqL R0p7HEj4HpdF/4FQdEcDnJ2+2G6O0xZV+rml1yPBp3tkMH9D1MJWXb1q3zwUQNzF65c2/e ULE0778Zh3IjluZDKHdleUN6EJnPt1OaRyP5d6LfR7OUJ61JvjoIF/WR6IqgRkyLohJfji 5PdoPP2r7rIGNeqjXZ92H9N60xof+4YokItRRBsmZhDFOZvWQRgPN98BSPNGOnhP15p+HH cBhL6zI6NSSBjQJHH6MRH7+uXIlFdcbUCt8gQ3kn8tYYnLwxLCA1KOivRUHJxA== 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=1745615152; 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=/aWP05ifZajt0YFkdeW9DKvEwhaE4poqZOk1W+11mFM=; b=F6Zrwd3S8v3mCv4lGWAu3rYcHCsGv+IspbVMC4D2H3zNHWxTiDEJNeNDAwuKmP+0VddKE6 tz9Xoa8tUN3+NuRJJ2c51VfdAsEhRm8MvAVfBf7ewVc59sRGOc/gaFNXfhnm+qTEJG7y18 g96TyM5UaAPKJQmqlc+/C3fjuJAZ6ra890RdGFJ5PYV2GJvsY7V6xxKXpewGaXuUgACkar pEJpOqcNEz3xXEY/GBzjOkZCdcEVx3hCMMO52oGM7Y9T/XGUqgg+rU+vResPA+BWCswa4I bkEt9bq57CpgAdX0YmQJ8N/L43d4W856/SvcjLcdaN1lOeS7R2XBOmApwIsKQg== 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 4Zklk81pJFzrl3; Fri, 25 Apr 2025 21:05:52 +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 53PL5qDm006265; Fri, 25 Apr 2025 21:05:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53PL5q87006262; Fri, 25 Apr 2025 21:05:52 GMT (envelope-from git) Date: Fri, 25 Apr 2025 21:05:52 GMT Message-Id: <202504252105.53PL5q87006262@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: 2a4cd9f8c82d - main - tests/arp: Add a 1-second tolerance 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: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a4cd9f8c82d73784af99067272ae169affb29c6 Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=2a4cd9f8c82d73784af99067272ae169affb29c6 commit 2a4cd9f8c82d73784af99067272ae169affb29c6 Author: Olivier Cochard AuthorDate: 2025-04-25 20:57:25 +0000 Commit: Olivier Cochard CommitDate: 2025-04-25 21:03:21 +0000 tests/arp: Add a 1-second tolerance This test could be flaky in case of a 1-second delay between the ping and the ARP cache display, which can happen on highly loaded hosts running multiple regression test VMs Approved by: glebius Obtained from: glebius Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D50039 --- tests/sys/netinet/arp.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/sys/netinet/arp.sh b/tests/sys/netinet/arp.sh index c7744d5de938..df5dbc50ffa1 100755 --- a/tests/sys/netinet/arp.sh +++ b/tests/sys/netinet/arp.sh @@ -188,7 +188,9 @@ static_body() { ipa=198.51.100.1 ipb=198.51.100.2 + ipb_re=$(echo ${ipb} | sed 's/\./\\./g') max_age=$(sysctl -n net.link.ether.inet.max_age) + max_age="(${max_age}|$((${max_age} - 1)))" atf_check ifconfig -j ${jname}a ${epair0}a inet ${ipa}/24 eth="$(ifconfig -j ${jname}b ${epair0}b | @@ -197,8 +199,8 @@ static_body() { # Expected outputs permanent=\ "? (${ipb}) at 00:00:00:00:00:00 on ${epair0}a permanent [ethernet]\n" - temporary=\ -"? (${ipb}) at ${eth} on ${epair0}a expires in ${max_age} seconds [ethernet]\n" + temporary_re=\ +"\? \(${ipb_re}\) at ${eth} on ${epair0}a expires in ${max_age} seconds \[ethernet\]" deleted=\ "${ipb} (${ipb}) deleted\n" @@ -217,7 +219,7 @@ static_body() { # then check -S atf_check -o "inline:${deleted}" jexec ${jname}a arp -nd ${ipb} atf_check -o ignore jexec ${jname}b ping -c1 ${ipa} - atf_check -o "inline:${temporary}" jexec ${jname}a arp -n ${ipb} + atf_check -o "match:${temporary_re}" jexec ${jname}a arp -n ${ipb} # Note: this doesn't fail, tracked all the way down to FreeBSD 8 # atf_check -s not-exit:0 jexec ${jname}a arp -s ${ipb} 0:0:0:0:0:0 atf_check -o "inline:${deleted}" \