mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

Fix pytest module detection for run.sh

Browse Source 
To allow concurrent invocations of pytest, it is necessary to assign
ports properly to avoid conflicts. In order to do that, pytest needs to
know a complete list of all test modules.

When pytest is invoked from run.sh, the current working directory is the
system test directory. To properly detect other tests, the conftest.py
has to look in the bin/tests/system directory, rather than the current
working directory.
This commit is contained in:
Tom Krizek
2023-08-31 13:18:17 +02:00
parent 56c1087304
commit d4502206a1
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bin/tests/system/conftest.py
View File

@@ -267,13 +267,21 @@ else:
@pytest.fixture(scope="session")
def modules():
"""Sorted list of all modules. Used to determine port distribution."""
"""
Sorted list of ALL modules.
The list includes even test modules that are not tested in the current
session. It is used to determine port distribution. Using a complete
list of all possible test modules allows independent concurrent pytest
invocations.
"""
mods = []
for dirpath, _dirs, files in os.walk(os.getcwd()):
for dirpath, _dirs, files in os.walk(FILE_DIR):
for file in files:
if file.startswith("tests_") and file.endswith(".py"):
mod = f"{dirpath}/{file}"
mods.append(mod)
if not pytest_ignore_collect(mod):
mods.append(mod)
return sorted(mods)
@pytest.fixture(scope="session")
@@ -281,11 +289,11 @@ else:
"""
Dictionary containing assigned base port for every module.
Note that this is a session-wide fixture. The port numbers are
deterministically assigned before any testing starts. This fixture MUST
return the same value when called again during the same test session.
When running tests in parallel, this is exactly what happens - every
worker thread will call this fixture to determine test ports.
The port numbers are deterministically assigned before any testing
starts. This fixture MUST return the same value when called again
during the same test session. When running tests in parallel, this is
exactly what happens - every worker thread will call this fixture to
determine test ports.
"""
port_min = PORT_MIN
port_max = PORT_MAX - len(modules) * PORTS_PER_TEST