XDIST_WORKER = os.environ.get("PYTEST_XDIST_WORKER", "")
FILE_DIR = os.path.abspath(Path(__file__).parent)
ENV_RE = re.compile(b"([^=]+)=(.*)")
-PORT_MIN = 5001
-PORT_MAX = 32767
-PORTS_PER_TEST = 20
PRIORITY_TESTS = [
# Tests that are scheduled first. Speeds up parallel execution.
"rpz/",
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
+ port_min = isctest.vars.ports.PORT_MIN
+ port_max = (
+ isctest.vars.ports.PORT_MAX - len(modules) * isctest.vars.ports.PORTS_PER_TEST
+ )
if port_max < port_min:
raise RuntimeError("not enough ports to assign unique port set to each module")
# be misleading.
base_port = int(time.time() // 3600) % (port_max - port_min) + port_min
- return {mod: base_port + i * PORTS_PER_TEST for i, mod in enumerate(modules)}
+ return {
+ mod: base_port + i * isctest.vars.ports.PORTS_PER_TEST
+ for i, mod in enumerate(modules)
+ }
-@pytest.fixture(scope="module")
+@pytest.fixture(autouse=True, scope="module")
def base_port(request, module_base_ports):
"""Start of the port range assigned to a particular test module."""
port = module_base_ports[request.fspath]
+ isctest.vars.ports.set_base_port(port)
return port
@pytest.fixture(scope="module")
-def ports(base_port):
- """Dictionary containing port names and their assigned values."""
- return {
- "PORT": base_port,
- "TLSPORT": base_port + 1,
- "HTTPPORT": base_port + 2,
- "HTTPSPORT": base_port + 3,
- "EXTRAPORT1": base_port + 4,
- "EXTRAPORT2": base_port + 5,
- "EXTRAPORT3": base_port + 6,
- "EXTRAPORT4": base_port + 7,
- "EXTRAPORT5": base_port + 8,
- "EXTRAPORT6": base_port + 9,
- "EXTRAPORT7": base_port + 10,
- "EXTRAPORT8": base_port + 11,
- "CONTROLPORT": base_port + 12,
- }
+def named_port():
+ return int(os.environ["PORT"])
@pytest.fixture(scope="module")
-def named_port(ports):
- return ports["PORT"]
+def named_tlsport():
+ return int(os.environ["TLSPORT"])
@pytest.fixture(scope="module")
-def named_tlsport(ports):
- return ports["TLSPORT"]
+def named_httpsport():
+ return int(os.environ["HTTPSPORT"])
@pytest.fixture(scope="module")
-def named_httpsport(ports):
- return ports["HTTPSPORT"]
+def control_port():
+ return int(os.environ["CONTROLPORT"])
@pytest.fixture(scope="module")
-def control_port(ports):
- return ports["CONTROLPORT"]
-
-
-@pytest.fixture(scope="module")
-def env(ports):
+def env():
"""Dictionary containing environment variables for the test."""
env = dict(isctest.vars.ALL)
- for portname, portnum in ports.items():
- env[portname] = str(portnum)
env["builddir"] = f"{env['TOP_BUILDDIR']}/{SYSTEM_TEST_DIR_GIT_PATH}"
env["srcdir"] = f"{env['TOP_SRCDIR']}/{SYSTEM_TEST_DIR_GIT_PATH}"
os.environ.update(env)
isctest.log.info(f"test started: {request.node.name}")
port = int(env["PORT"])
- isctest.log.info("using port range: <%d, %d>", port, port + PORTS_PER_TEST - 1)
+ isctest.log.info(
+ "using port range: <%d, %d>", port, port + isctest.vars.ports.PORTS_PER_TEST - 1
+ )
if not hasattr(request.node, "stash"): # compatibility with pytest<7.0.0
request.node.stash = {} # use regular dict instead of pytest.Stash
@pytest.fixture
-def servers(ports, system_test_dir):
+def servers(system_test_dir):
instances = {}
for entry in system_test_dir.rglob("*"):
if entry.is_dir():
try:
dir_name = entry.name
- # LATER: Make ports fixture return NamedPorts directly
- named_ports = isctest.instance.NamedPorts(
- dns=int(ports["PORT"]), rndc=int(ports["CONTROLPORT"])
- )
- instance = isctest.instance.NamedInstance(dir_name, named_ports)
+ instance = isctest.instance.NamedInstance(dir_name)
instances[dir_name] = instance
except ValueError:
continue
dns: int = 53
rndc: int = 953
+ @staticmethod
+ def from_env():
+ return NamedPorts(
+ dns=int(os.environ["PORT"]),
+ rndc=int(os.environ["CONTROLPORT"]),
+ )
+
class NamedInstance:
"""
def __init__(
self,
identifier: str,
- ports: NamedPorts = NamedPorts(),
+ ports: Optional[NamedPorts] = None,
rndc_logger: Optional[logging.Logger] = None,
rndc_executor: Optional[RNDCExecutor] = None,
) -> None:
`ports` is the `NamedPorts` instance listing the UDP/TCP ports on which
this `named` instance is listening for various types of traffic (both
- DNS traffic and RNDC commands).
+ DNS traffic and RNDC commands). Defaults to ports set by the test
+ framework.
`rndc_logger` is the `logging.Logger` to use for logging RNDC
commands sent to this `named` instance.
that is used for executing RNDC commands on this `named` instance.
"""
self.ip = self._identifier_to_ip(identifier)
+ if ports is None:
+ ports = NamedPorts.from_env()
self.ports = ports
self.log = LogFile(os.path.join(identifier, "named.run"))
self._rndc_executor = rndc_executor or RNDCBinaryExecutor()
--- /dev/null
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, you can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+import os
+
+from .. import log
+
+PORT_MIN = 5001
+PORT_MAX = 32767
+PORTS_PER_TEST = 20
+
+PORT_VARS = {
+ "PORT": "5300",
+ "TLSPORT": "5301",
+ "HTTPPORT": "5302",
+ "HTTPSPORT": "5303",
+ "EXTRAPORT1": "5304",
+ "EXTRAPORT2": "5305",
+ "EXTRAPORT3": "5306",
+ "EXTRAPORT4": "5307",
+ "EXTRAPORT5": "5308",
+ "EXTRAPORT6": "5309",
+ "EXTRAPORT7": "5310",
+ "EXTRAPORT8": "5311",
+ "CONTROLPORT": "5312",
+}
+
+
+def set_base_port(base_port: int):
+ log.debug(f"setting base port {base_port}")
+ assert base_port >= PORT_MIN
+ assert base_port <= PORT_MAX
+ PORT_VARS["PORT"] = str(base_port)
+ PORT_VARS["TLSPORT"] = str(base_port + 1)
+ PORT_VARS["HTTPPORT"] = str(base_port + 2)
+ PORT_VARS["HTTPSPORT"] = str(base_port + 3)
+ PORT_VARS["EXTRAPORT1"] = str(base_port + 4)
+ PORT_VARS["EXTRAPORT2"] = str(base_port + 5)
+ PORT_VARS["EXTRAPORT3"] = str(base_port + 6)
+ PORT_VARS["EXTRAPORT4"] = str(base_port + 7)
+ PORT_VARS["EXTRAPORT5"] = str(base_port + 8)
+ PORT_VARS["EXTRAPORT6"] = str(base_port + 9)
+ PORT_VARS["EXTRAPORT7"] = str(base_port + 10)
+ PORT_VARS["EXTRAPORT8"] = str(base_port + 11)
+ PORT_VARS["CONTROLPORT"] = str(base_port + 12)
+ os.environ.update(PORT_VARS)
projects / thirdparty / bind9.git / commitdiff
