upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-08 21:52:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'mnowak/accommodate-black-24.2.0' into 'main'

Browse source 
Accommodate black 24.2.0

See merge request isc-projects/bind9!8729
This commit is contained in:
Michal Nowak 2024-02-14 11:31:34 +00:00
commit 917851ac5c
4 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bin/tests/system/checkds/tests_checkds.py
View file

@ -312,9 +312,11 @@ def dspublished_tests(checkds, addr):
CheckDSTest(
zone=f"bad.{checkds}.dspublish.ns6",
logs_to_wait_for=(
"bad DS response from 10.53.0.6"
if checkds == "explicit"
else "error during parental-agents processing",
(
"bad DS response from 10.53.0.6"
if checkds == "explicit"
else "error during parental-agents processing"
),
),
expected_parent_state="!DSPublish",
),
@ -394,9 +396,11 @@ def dswithdrawn_tests(checkds, addr):
CheckDSTest(
zone=f"bad.{checkds}.dsremoved.ns6",
logs_to_wait_for=(
"bad DS response from 10.53.0.6"
if checkds == "explicit"
else "error during parental-agents processing",
(
"bad DS response from 10.53.0.6"
if checkds == "explicit"
else "error during parental-agents processing"
),
),
expected_parent_state="!DSRemoved",
),

1
bin/tests/system/isctest/instance.py
View file

@ -27,7 +27,6 @@ class NamedPorts(NamedTuple):
class NamedInstance:
"""
A class representing a `named` instance used in a system test.

19
bin/tests/system/isctest/log.py
View file

@ -57,7 +57,6 @@ class LogFile:
class WatchLog(abc.ABC):
"""
Wait for a log message to appear in a text file.
@ -294,19 +293,18 @@ class WatchLogFromHere(WatchLog):
# pylint: disable=too-few-public-methods
class RNDCExecutor(abc.ABC):
"""
An interface which RNDC executors have to implement in order for the
`NamedInstance` class to be able to use them.
"""
@overload
def call(self, ip: str, port: int, command: str, timeout: int = 10) -> str:
...
def call(self, ip: str, port: int, command: str, timeout: int = 10) -> str: ...
@overload
def call(self, ip: str, port: int, command: List[str], timeout: int = 10) -> str:
...
def call(
self, ip: str, port: int, command: List[str], timeout: int = 10
) -> str: ...
@abc.abstractmethod
def call(
@ -326,7 +324,6 @@ class RNDCException(Exception):
class RNDCBinaryExecutor(RNDCExecutor):
"""
An `RNDCExecutor` which sends RNDC commands to servers using the `rndc`
binary.
@ -342,12 +339,12 @@ class RNDCBinaryExecutor(RNDCExecutor):
self._base_cmdline = [rndc_path, "-c", rndc_conf]
@overload
def call(self, ip: str, port: int, command: str, timeout: int = 10) -> str:
...
def call(self, ip: str, port: int, command: str, timeout: int = 10) -> str: ...
@overload
def call(self, ip: str, port: int, command: List[str], timeout: int = 10) -> str:
...
def call(
self, ip: str, port: int, command: List[str], timeout: int = 10
) -> str: ...
def call(
self, ip: str, port: int, command: Union[str, List[str]], timeout: int = 10

2
bin/tests/system/isctest/rndc.py
View file

@ -16,7 +16,6 @@ import subprocess
# pylint: disable=too-few-public-methods
class RNDCExecutor(abc.ABC):
"""
An interface which RNDC executors have to implement in order for the
`NamedInstance` class to be able to use them.
@ -38,7 +37,6 @@ class RNDCException(Exception):
class RNDCBinaryExecutor(RNDCExecutor):
"""
An `RNDCExecutor` which sends RNDC commands to servers using the `rndc`
binary.