From nobody Sun Nov 24 08:34:31 2024 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 4Xx2FM2sp4z5dm0T; Sun, 24 Nov 2024 08:34:31 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xx2FM1wj9z4nfQ; Sun, 24 Nov 2024 08:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732437271; 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=ldL+m44Ld9jBtprTRlCeDtTRj8q83laQdUwVlLAmPKU=; b=dzUtFXNE9dKOQoGa+bIwUH7ZalfRpdW8LQXOFFpdeLMmI7c72UxDclpxdiE4dsR5ZSOu0+ cfR0AjEbtbQvu+Zj7gwoEd4YB118nSIGM2J+GYC2gDZIy/DrhI6/bDOirs35t5xWlt1zt3 UhtiLADFXpaCKzCeV+EX3NYnxru5e8ef1DG8qqmdhDIO/C3i7lzIJxqvAcWfV0T21Kauoq Ek8cita9wMuw+eZ8DuvA7nYcGpM7hj87YnFGI5VKw4dDbiJCWAUDw/SC1jwN6kJ1DGDll5 iTbjMk0YT0QmhQml+oioI5pUG0nIe9CIYs70+EE/Uu9ssY3IzTRBCUHrRxinfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732437271; 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=ldL+m44Ld9jBtprTRlCeDtTRj8q83laQdUwVlLAmPKU=; b=EI9rKj3QRwYQUpT/sNE5T1MWdnlEGVMTD+qXnIKFG4X5jItcXOGew673CJ1j99BnrrcpPb bkfQ/Oogtu0D2t+nfGNGGM6O8Ir9iyeQ7CrEAG7PkKrUikkACmIg8/HZ8iC8yi1VSRDD+b ZIq8KuKOVtHEMhKY01xfTLdwz5eE+7srNvfJaBaMulpaUsrvuB1FTFT91AEjS1wIKnK9zo q16ZfSNrSxEit1IF/6HwGQRmgv0eVFaMv0K4tN7KYP09klO/yQ5qxbS1pgFFDczDvxlyv6 hH+FtpLbs3Ar8mtwUj4NNGQnPMYIlrowez3VABW8Hg4wXcajIyJYzh0CVqrpfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732437271; a=rsa-sha256; cv=none; b=qVmNljXc11rK9S1ETu9kP1Iw6+7OXaTQ6XE4ztHWoEiQ2sSQ7sWLDWeHVzOijCzS89vxsn zs8U7Gh5SxUsK/9yTvBq301qTcfGEnEBJolHbfuPZ+3jrHjKl7KFTDv4D46SyTJxPYHrx6 YWJH5cVI/ALtxML0itWvXJZgcXXimyW3U+I08IJ5YrrbEMZhGGpoyRypYhrhJrcQA0AJ3S sA9eGU83XhP5LvQDsyJ/xJ8NJ6mp58NNMzel3tPEwDwUI6vQHOr8FiP8hG4xy4g7VGZeFs KtjMeh3uOnkezWCP2PP/nk2tRpKIqBCQJyw2SWMxw5dkmqzScGlA1Y4S0yVddw== 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 4Xx2FM18qkznH4; Sun, 24 Nov 2024 08:34:31 +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 4AO8YVMs017316; Sun, 24 Nov 2024 08:34:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AO8YVqw017313; Sun, 24 Nov 2024 08:34:31 GMT (envelope-from git) Date: Sun, 24 Nov 2024 08:34:31 GMT Message-Id: <202411240834.4AO8YVqw017313@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: a46c121db4a5 - main - netpfil tests: make dummynet tests more robust 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a46c121db4a50748eae0a32bed786f68349c95f5 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a46c121db4a50748eae0a32bed786f68349c95f5 commit a46c121db4a50748eae0a32bed786f68349c95f5 Author: Kristof Provost AuthorDate: 2024-11-23 18:29:02 +0000 Commit: Kristof Provost CommitDate: 2024-11-24 08:34:09 +0000 netpfil tests: make dummynet tests more robust These tests try to verify that packet prioritisation works as expected. This is inherently a statistical process, and is difficuly to measure automatically. Run the tests more times and accept more failures. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/common/dummynet.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/sys/netpfil/common/dummynet.sh b/tests/sys/netpfil/common/dummynet.sh index 126240f00384..b77b2df84010 100644 --- a/tests/sys/netpfil/common/dummynet.sh +++ b/tests/sys/netpfil/common/dummynet.sh @@ -320,7 +320,7 @@ queue_body() # TCP should still just pass fails=0 - for i in `seq 1 3` + for i in `seq 1 5` do result=$(dd if=/dev/zero bs=1024 count=2000 | timeout 3 nc -w 5 -N 192.0.2.2 7 | wc -c) if [ $result -ne 2048000 ]; @@ -329,7 +329,7 @@ queue_body() fails=$(( ${fails} + 1 )) fi done - if [ ${fails} -gt 0 ]; + if [ ${fails} -gt 2 ]; then atf_fail "We failed prioritisation ${fails} times" fi @@ -348,7 +348,7 @@ queue_body() sleep 1 fails=0 - for i in `seq 1 3` + for i in `seq 1 5` do result=$(dd if=/dev/zero bs=1024 count=2000 | timeout 3 nc -w 5 -N 192.0.2.2 7 | wc -c) if [ $result -ne 2048000 ]; @@ -429,7 +429,7 @@ queue_v6_body() # TCP should still just pass fails=0 - for i in `seq 1 3` + for i in `seq 1 5` do result=$(dd if=/dev/zero bs=1024 count=1000 | timeout 3 nc -w 5 -N 2001:db8:42::2 7 | wc -c) if [ $result -ne 1024000 ]; @@ -438,7 +438,7 @@ queue_v6_body() fails=$(( ${fails} + 1 )) fi done - if [ ${fails} -gt 0 ]; + if [ ${fails} -gt 2 ]; then atf_fail "We failed prioritisation ${fails} times" fi @@ -454,7 +454,7 @@ queue_v6_body() "pass in proto icmp6 dnqueue (0, 100)" fails=0 - for i in `seq 1 3` + for i in `seq 1 5` do result=$(dd if=/dev/zero bs=1024 count=1000 | timeout 3 nc -w 5 -N 2001:db8:42::2 7 | wc -c) if [ $result -ne 1024000 ];