hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-26 10:53:39 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

netinet tests: Make some tests more reliable when run in parallel

Browse Source 
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
This commit is contained in:
Mark Johnston 2024-09-09 15:28:24 +00:00
parent c77ca9a72c
commit b103fc49ae
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/sys/netinet/Makefile
View File

@ -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"

18
tests/sys/netinet6/Makefile
View File

@ -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 \