upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-07-15 15:20:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[9.20] fix: test: Fix pytest-xdist loadscope splitting on "::" in params

Browse source 
LoadScopeScheduling._split_scope() uses rsplit("::", 1) to
extract the test file scope from a node ID.  When parametrized
test values contain "::" (IPv6 addresses like "cafe:cafe::cafe"
or "::1"), the split lands inside the parameter instead of at
the .py:: boundary.  This creates spurious scopes that get
assigned to different workers, each triggering a full fixture
setup (starting named instances).

Override _split_scope() in conftest.py to split on ".py::"
which is unambiguous.

Six tests in synthrecord/tests_synthrecord.py are affected.
A verification script is included in util/.

Assisted-by: Claude:claude-opus-4-7

Backport of MR !12103

Merge branch 'backport-mnowak/fix-xdist-loadscope-split-9.20' into 'bind-9.20'

See merge request isc-projects/bind9!12137
This commit is contained in:
Michal Nowak 2026-05-28 18:49:04 +02:00
commit 1efa52a3f0
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,6 +74,30 @@ SYMLINK_REPLACEMENT_RE = Re(r"/tests_(.*)\.py")
isctest.check.is_executable(isctest.vars.ALL["PYTHON"], "Python interpreter required")
isctest.check.is_executable(isctest.vars.ALL["PERL"], "Perl interpreter required")
# ---- Fix pytest-xdist loadscope for node IDs containing "::" ----------
# LoadScopeScheduling._split_scope uses rsplit("::", 1) which breaks when
# test parameters contain "::" (e.g. IPv6 addresses like "cafe:cafe::cafe").
# This causes tests from the same file to be assigned to different workers,
# each paying the full fixture setup cost. Override to split on ".py::"
# which is unambiguous.
# https://github.com/pytest-dev/pytest-xdist/issues/1335
try:
from xdist.scheduler.loadscope import LoadScopeScheduling
# pylint: disable=protected-access
_orig_split_scope = LoadScopeScheduling._split_scope
def _fixed_split_scope(self, nodeid):
if ".py::" in nodeid:
return nodeid.split(".py::")[0] + ".py"
return _orig_split_scope(self, nodeid)
LoadScopeScheduling._split_scope = _fixed_split_scope
# pylint: enable=protected-access
except ImportError:
pass
# --------------------------- pytest hooks -------------------------------