From nobody Mon Sep 09 15:28:45 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 4X2W2P3XJVz5WgFH; Mon, 09 Sep 2024 15:28:45 +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 4X2W2P2yGzz4m3g; Mon, 9 Sep 2024 15:28:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725895725; 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=wAW71jmb5Bl3hjBvzNF1Gv0HPPh55T3TwSfzn3wMj8c=; b=lSVG3ZFOlFkufJr3TM4BWwlTNfs1eXSvbON0hdWoY3B0H7xk3L1SofSB+ecHXROsgjs5Vb 5CzDSwaZWuFVYZSlsdeVPSYwhLDZiWUDYajMy0tr19+LwVw+u92FupEBwSnHwVgfwMryxP Pg/X7nR3kG/gHKMkI3LgZb9NjNc4t9koqGaXcMo8Zp5oxJwG5O6ILDoefq4JNPJe7gvUi7 jGRdD4EaWxicnLVUsU7NSzPSRyRqbqH29+Gdoa7SLH+PHT0CFBfoT131ODpPXqC++HD3Un sME1G2nLhu8JkJEGaTqMIQdMI0QvyomADIC4DyL302qd1S5Df5TUDX262PcTUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725895725; a=rsa-sha256; cv=none; b=KoCOSupQz5XouT1uNUVDydpxk4dkmC9wGLv2OLRzU1TuyPjrHC7678BSyQWGYkezDE4iNv bE+6/wLlS4IAYxdnWEa4JgzBAkD0IBO+dKlGqxYW4DBg3yvnENTMOciyz6dzz6U077QfAG p8hcu1w2zDHPNyj0V+RBhes/Nyp3hm5nocXb1pgBl2xPBQf9KLhl3ob9cTdonkaNONMPu+ YocevR3gLS2v84/mIVbCRXMEh19p5umc8JCISFrjglBjk0AnyQrZnx7phLh4o01TL4uplo Vr/cxf+oJWGHyiCuq14MUd6TLwhlTXonbo3wjaM1uu/bbC89f7qSTaZPmUFDRA== 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=1725895725; 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=wAW71jmb5Bl3hjBvzNF1Gv0HPPh55T3TwSfzn3wMj8c=; b=Bt3rE1/oYJzHJ9PR9GNZMwIkgtBdL0avGRMeewF5RKPVnbrkj6QKHt+xMC3nQGu89m1CKT EPIDgqv4Mw3cTiqpBqwBhLc2+PmCCVyT8v1gKFZSNiQv0dj5YD3o+jAXPsICuIzdjof7cN BiCpCaR6IEhlHUvmamEWSn80/ezZLTmRbvczDBjSjAh8erkz6spVmWZFUtPC4x6qRkVQwz TRJFweGrsPpo55DlB894H2XHg3qGlJZ81orBBjbgOinS2XVRqwnHWSCpmyT1MMXuUUgslY vBQvet+B9zDobkCXSSc27scDlWUiHC+BY8J+XekPn3BN8A7hrswe+mGAvOL4WA== 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 4X2W2P2Ywzz17nZ; Mon, 9 Sep 2024 15:28:45 +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 489FSjul073698; Mon, 9 Sep 2024 15:28:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 489FSjjU073695; Mon, 9 Sep 2024 15:28:45 GMT (envelope-from git) Date: Mon, 9 Sep 2024 15:28:45 GMT Message-Id: <202409091528.489FSjjU073695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b103fc49ae16 - main - netinet tests: Make some tests more reliable when run in parallel 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b103fc49ae160fdce221c2fffa98dde9bc0ff3b0 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b103fc49ae160fdce221c2fffa98dde9bc0ff3b0 commit b103fc49ae160fdce221c2fffa98dde9bc0ff3b0 Author: Mark Johnston AuthorDate: 2024-09-09 15:28:24 +0000 Commit: Mark Johnston CommitDate: 2024-09-09 15:28:24 +0000 netinet tests: Make some tests more reliable when run in parallel Many of the modified tests add epair interfaces to the host, though most of the tests themselves run in a VNET jail. scapy in particular becomes unhappy when the list of interfaces changes as it is running, so, to improve reliability of parallel test runs, isolate tests which add epairs to the host. Also serialize arp tests, as they examine the dmesg as part of the test. The list of modified tests is not exhaustive, it was determined by running the test suite with parallelization enabled and looking at failures. It may be easier to just automatically enable VNET jailing of all netinet tests, but let's be more particular for now. Reviewed by: kp MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D46606 --- tests/sys/netinet/Makefile | 11 +++++++++-- tests/sys/netinet6/Makefile | 18 +++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile index 7e12dae6a4fa..a6f07d135724 100644 --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -27,8 +27,15 @@ ATF_TESTS_SH= arp \ ATF_TESTS_PYTEST+= carp.py ATF_TESTS_PYTEST+= igmp.py -TEST_METADATA.divert+= required_programs="python" -TEST_METADATA.forward+= required_programs="python" +# Some of the arp tests look for log messages in the dmesg buffer, so run them +# serially to avoid problems with interleaved output. +TEST_METADATA.arp+= is_exclusive="true" +TEST_METADATA.divert+= required_programs="python" \ + execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" +TEST_METADATA.forward+= required_programs="python" \ + execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" TEST_METADATA.output+= required_programs="python" TEST_METADATA.redirect+= required_programs="python" TEST_METADATA.tcp6_v4mapped_bind_test+= is_exclusive="true" diff --git a/tests/sys/netinet6/Makefile b/tests/sys/netinet6/Makefile index 45e88b50164b..753571fbf7a1 100644 --- a/tests/sys/netinet6/Makefile +++ b/tests/sys/netinet6/Makefile @@ -16,7 +16,23 @@ ATF_TESTS_SH= exthdr \ ndp \ proxy_ndp -TEST_METADATA.output6+= required_programs="python" +TEST_METADATA.divert+= execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" +TEST_METADATA.exthdr+= execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" +TEST_METADATA.forward6+= execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" +TEST_METADATA.ndp+= execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" +TEST_METADATA.output6+= execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" \ + required_programs="python" +TEST_METADATA.proxy_ndp+= execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" +TEST_METADATA.redirect+= execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" +TEST_METADATA.scapyi386+= execenv="jail" \ + execenv_jail_params="vnet allow.raw_sockets" ${PACKAGE}FILES+= exthdr.py \ mld.py \