Automatically sort imports in Python code

Generated with: ruff check --extend-select I --fix (with the changes to
pyproject.toml applied).

(cherry picked from commit ffd5b6ac26)

bin/tests/convert_trs_to_junit.py

@@ -6,12 +6,12 @@
 #
 # Convert automake .trs files into JUnit format suitable for Gitlab
 
+from xml.etree import ElementTree
+from xml.etree.ElementTree import Element, SubElement
+
 import argparse
 import os
 import sys
-from xml.etree import ElementTree
-from xml.etree.ElementTree import Element
-from xml.etree.ElementTree import SubElement
 
 
 # getting explicit encoding specification right for Python 2/3 would be messy,

bin/tests/system/ans.py

@@ -32,9 +32,7 @@ useful in other system tests, please consider opening a merge request extending
 isctest/asyncserver.py.
 """
 
-from isctest.asyncserver import (
-    AsyncDnsServer,
-)
+from isctest.asyncserver import AsyncDnsServer
 
 
 def main() -> None:

bin/tests/system/bailiwick/ans1/ans.py

@@ -16,11 +16,7 @@ from typing import AsyncGenerator
 import dns.rdatatype
 import dns.rrset
 
-from isctest.asyncserver import (
-    DnsResponseSend,
-    QueryContext,
-    ResponseAction,
-)
+from isctest.asyncserver import DnsResponseSend, QueryContext, ResponseAction
 
 from ..bailiwick_ans import ResponseSpoofer, spoofing_server
 

bin/tests/system/bailiwick/ans2/ans.py

@@ -16,11 +16,7 @@ from typing import AsyncGenerator
 import dns.rdatatype
 import dns.rrset
 
-from isctest.asyncserver import (
-    DnsResponseSend,
-    QueryContext,
-    ResponseAction,
-)
+from isctest.asyncserver import DnsResponseSend, QueryContext, ResponseAction
 
 from ..bailiwick_ans import ResponseSpoofer, spoofing_server
 

bin/tests/system/bailiwick/tests_bailiwick.py

@@ -14,12 +14,12 @@ from typing import Dict
 import time
 
 import dns.message
-
 import pytest
 
-import isctest
 from isctest.instance import NamedInstance
 
+import isctest
+
 
 @pytest.fixture(autouse=True)
 def autouse_flush_resolver_cache(servers: Dict[str, NamedInstance]) -> None:

bin/tests/system/checkds/tests_checkds.py

@@ -18,15 +18,15 @@ import os
 import sys
 import time
 
-import isctest
-import pytest
-
 import dns.exception
 import dns.message
 import dns.name
 import dns.rcode
 import dns.rdataclass
 import dns.rdatatype
+import pytest
+
+import isctest
 
 pytestmark = [
     pytest.mark.skipif(

bin/tests/system/cipher-suites/tests_cipher_suites.py

@@ -11,9 +11,8 @@
 
 from re import compile as Re
 
-import pytest
-
 import dns.message
+import pytest
 
 import isctest
 import isctest.mark

bin/tests/system/conftest.py

@@ -9,24 +9,26 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import filecmp
-import os
 from pathlib import Path
 from re import compile as Re
+
+import filecmp
+import os
 import shutil
 import subprocess
+import sys
 import tempfile
 import time
-import sys
 
 import pytest
 
 pytest.register_assert_rewrite("isctest")
 
 # pylint: disable=wrong-import-position
-import isctest
 from isctest.vars.dirs import SYSTEM_TEST_DIR_GIT_PATH
 
+import isctest
+
 # pylint: enable=wrong-import-position
 
 # Silence warnings caused by passing a pytest fixture to another fixture.

bin/tests/system/convert_junit_to_trs.py

@@ -6,11 +6,12 @@
 #
 # Convert JUnit pytest output to automake .trs files
 
-import argparse
 from pathlib import Path
-import sys
 from xml.etree import ElementTree
 
+import argparse
+import sys
+
 
 def junit_to_trs(junit_xml):
     root = ElementTree.fromstring(junit_xml)

bin/tests/system/cookie/cookie_ans.py

@@ -20,12 +20,11 @@ import dns.tsigkeyring
 
 from isctest.asyncserver import (
     AsyncDnsServer,
-    ResponseHandler,
-    DnsResponseSend,
     DnsProtocol,
+    DnsResponseSend,
     QueryContext,
+    ResponseHandler,
 )
-
 from isctest.name import prepend_label
 from isctest.vars.algorithms import ALG_VARS
 

bin/tests/system/digdelv/ans4/ans.py

@@ -9,10 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-from isctest.asyncserver import (
-    AsyncDnsServer,
-    IgnoreAllQueries,
-)
+from isctest.asyncserver import AsyncDnsServer, IgnoreAllQueries
 
 
 def main() -> None:

bin/tests/system/digdelv/ans5/ans.py

@@ -9,9 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import logging
 from typing import AsyncGenerator, List, Optional
 
+import logging
+
 import dns.rcode
 import dns.rdatatype
 import dns.rrset

bin/tests/system/digdelv/ans6/ans.py

@@ -17,8 +17,8 @@ import dns.rcode
 from isctest.asyncserver import (
     AsyncDnsServer,
     DnsResponseSend,
-    ResponseHandler,
     QueryContext,
+    ResponseHandler,
 )
 
 

bin/tests/system/dispatch/tests_connreset.py

@@ -11,10 +11,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import pytest
-import isctest
-
 import dns.message
+import pytest
+
+import isctest
 
 pytestmark = pytest.mark.extra_artifacts(
     [

bin/tests/system/dnssec-malformed-dnskey/tests_malformed_dnskey.py

@@ -9,18 +9,18 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import base64
 from re import compile as Re
 
+import base64
 import os
-import pytest
 
 from cryptography.hazmat.primitives.asymmetric import ec
+from dns.rdtypes.dnskeybase import Flag
 
 import dns
 import dns.dnssec
 import dns.zone
-from dns.rdtypes.dnskeybase import Flag
+import pytest
 
 import isctest
 

bin/tests/system/dnstap/tests_dnstap.py

@@ -14,11 +14,11 @@
 import os
 import re
 
-import isctest
-import isctest.mark
+import dns.rrset
 import pytest
 
-import dns.rrset
+import isctest
+import isctest.mark
 
 pytestmark = [
     isctest.mark.with_dnstap,

bin/tests/system/dnstap/ydump.py

@@ -17,8 +17,8 @@ except (ModuleNotFoundError, ImportError):
     print("No python yaml module, skipping")
     sys.exit(1)
 
-import subprocess
 import pprint
+import subprocess
 
 DNSTAP_READ = sys.argv[1]
 DATAFILE = sys.argv[2]

bin/tests/system/doth/conftest.py

@@ -14,6 +14,7 @@
 import shutil
 
 import pytest
+
 import isctest
 
 

bin/tests/system/doth/stress_http_quota.py

@@ -11,18 +11,16 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+from functools import reduce
+from resource import RLIMIT_NOFILE, getrlimit, setrlimit
+
 import os
-import sys
+import random
 import socket
 import subprocess
-import random
+import sys
 import time
 
-from functools import reduce
-from resource import getrlimit
-from resource import setrlimit
-from resource import RLIMIT_NOFILE
-
 MULTIDIG_INSTANCES = 10
 CONNECT_TRIES = 5
 

bin/tests/system/doth/tests_gnutls.py

@@ -16,13 +16,12 @@ import struct
 import subprocess
 import time
 
-import pytest
-
 import dns
 import dns.exception
 import dns.name
 import dns.rdataclass
 import dns.rdatatype
+import pytest
 
 import isctest
 

bin/tests/system/ecdsa/tests_ecdsa.py

@@ -10,9 +10,9 @@
 # information regarding copyright ownership.
 
 import os
-import pytest
 
 import dns.flags
+import pytest
 
 import isctest
 

bin/tests/system/filters/common.py

@@ -9,9 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import dns
 from dns import rdataclass, rdatatype
 
+import dns
+
 import isctest
 
 ARTIFACTS = [

bin/tests/system/filters/tests_filter_a_v4.py

@@ -11,8 +11,6 @@
 
 import pytest
 
-import isctest.mark
-
 from filters.common import (
     ARTIFACTS,
     check_filter,
@@ -20,6 +18,8 @@ from filters.common import (
     prime_cache,
 )
 
+import isctest.mark
+
 pytestmark = pytest.mark.extra_artifacts(ARTIFACTS)
 
 

bin/tests/system/filters/tests_filter_a_v6.py

@@ -11,8 +11,6 @@
 
 import pytest
 
-import isctest.mark
-
 from filters.common import (
     ARTIFACTS,
     check_filter,
@@ -20,6 +18,8 @@ from filters.common import (
     prime_cache,
 )
 
+import isctest.mark
+
 pytestmark = pytest.mark.extra_artifacts(ARTIFACTS)
 
 

bin/tests/system/filters/tests_filter_aaaa_v4.py

@@ -11,9 +11,6 @@
 
 import pytest
 
-import isctest
-import isctest.mark
-
 from filters.common import (
     ARTIFACTS,
     check_filter,
@@ -21,6 +18,9 @@ from filters.common import (
     prime_cache,
 )
 
+import isctest
+import isctest.mark
+
 pytestmark = pytest.mark.extra_artifacts(ARTIFACTS)
 
 

bin/tests/system/filters/tests_filter_aaaa_v6.py

@@ -11,8 +11,6 @@
 
 import pytest
 
-import isctest.mark
-
 from filters.common import (
     ARTIFACTS,
     check_filter,
@@ -20,6 +18,8 @@ from filters.common import (
     prime_cache,
 )
 
+import isctest.mark
+
 pytestmark = pytest.mark.extra_artifacts(ARTIFACTS)
 
 

bin/tests/system/filters/tests_filter_checkconf.py

@@ -15,10 +15,10 @@ import subprocess
 
 import pytest
 
-import isctest
-
 from filters.common import ARTIFACTS
 
+import isctest
+
 pytestmark = pytest.mark.extra_artifacts(ARTIFACTS)
 
 

bin/tests/system/filters/tests_filter_dns64.py

@@ -11,10 +11,10 @@
 
 import pytest
 
-import isctest
-
 from filters.common import ARTIFACTS
 
+import isctest
+
 pytestmark = pytest.mark.extra_artifacts(ARTIFACTS)
 
 

bin/tests/system/isctest/__init__.py

@@ -9,15 +9,17 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-from . import check
-from . import instance
-from . import hypothesis
-from . import query
-from . import kasp
-from . import run
-from . import template
-from . import log
-from . import vars  # pylint: disable=redefined-builtin
+from . import (  # pylint: disable=redefined-builtin
+    check,
+    hypothesis,
+    instance,
+    kasp,
+    log,
+    query,
+    run,
+    template,
+    vars,
+)
 
 # isctest.mark module is intentionally NOT imported, because it relies on
 # environment variables which might not be set at the time of import of the

bin/tests/system/isctest/asyncserver.py

@@ -20,8 +20,8 @@ from typing import (
     Dict,
     List,
     Optional,
-    Set,
     Sequence,
+    Set,
     Tuple,
     Union,
     cast,

bin/tests/system/isctest/check.py

@@ -9,12 +9,14 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+from typing import List, Optional, cast
+
 import difflib
 import shutil
-from typing import cast, List, Optional
+
+from dns.edns import EDECode, EDEOption
 
 import dns.edns
-from dns.edns import EDECode, EDEOption
 import dns.flags
 import dns.message
 import dns.rcode

bin/tests/system/isctest/hypothesis/__init__.py

@@ -12,5 +12,4 @@
 # This ensures we're using a suitable hypothesis version. A newer version is
 # required for FIPS-enabled platforms.
 
-from . import settings
-from . import strategies
+from . import settings, strategies

bin/tests/system/isctest/hypothesis/strategies.py

@@ -11,10 +11,11 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import collections.abc
 from typing import List, Union
 from warnings import warn
 
+import collections.abc
+
 from hypothesis.strategies import (
     binary,
     builds,
@@ -26,8 +27,8 @@ from hypothesis.strategies import (
     sampled_from,
 )
 
-import dns.name
 import dns.message
+import dns.name
 import dns.rdataclass
 import dns.rdatatype
 

bin/tests/system/isctest/instance.py

@@ -11,18 +11,18 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+from pathlib import Path
 from typing import List, NamedTuple, Optional
 
 import os
-from pathlib import Path
 import re
 
-import dns.update
 import dns.rcode
+import dns.update
 
-from .log import debug, WatchLogFromStart, WatchLogFromHere
-from .run import CmdResult, EnvCmd, perl
+from .log import WatchLogFromHere, WatchLogFromStart, debug
 from .query import udp
+from .run import CmdResult, EnvCmd, perl
 from .text import TextFile
 
 

bin/tests/system/isctest/kasp.py

@@ -11,13 +11,14 @@
 
 from datetime import datetime, timedelta, timezone
 from functools import total_ordering
+from pathlib import Path
+from re import compile as Re
+from typing import Dict, List, Optional, Tuple, Union
+
 import glob
 import os
-from pathlib import Path
 import re
-from re import compile as Re
 import time
-from typing import Dict, List, Optional, Tuple, Union
 
 import dns
 import dns.dnssec
@@ -25,12 +26,13 @@ import dns.rdatatype
 import dns.rrset
 import dns.tsig
 
+from isctest.instance import NamedInstance
+from isctest.template import TrustAnchor
+from isctest.vars.algorithms import ALL_ALGORITHMS_BY_NUM, Algorithm
+
 import isctest.log
 import isctest.query
 import isctest.util
-from isctest.instance import NamedInstance
-from isctest.template import TrustAnchor
-from isctest.vars.algorithms import Algorithm, ALL_ALGORITHMS_BY_NUM
 
 DEFAULT_TTL = 300
 

bin/tests/system/isctest/log/__init__.py

@@ -11,16 +11,15 @@
 
 from .basic import (
     avoid_duplicated_logs,
+    critical,
+    debug,
     deinit_module_logger,
     deinit_test_logger,
+    error,
+    info,
     init_conftest_logger,
     init_module_logger,
     init_test_logger,
-    debug,
-    info,
     warning,
-    error,
-    critical,
 )
-
-from .watchlog import WatchLogFromStart, WatchLogFromHere
+from .watchlog import WatchLogFromHere, WatchLogFromStart

bin/tests/system/isctest/log/basic.py

@@ -9,11 +9,12 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import logging
 from pathlib import Path
-import textwrap
 from typing import Dict, Optional
 
+import logging
+import textwrap
+
 LOG_FORMAT = "%(asctime)s %(levelname)7s:%(name)s  %(message)s"
 LOG_INDENT = 4
 

bin/tests/system/isctest/log/watchlog.py

@@ -15,7 +15,7 @@ import abc
 import os
 import time
 
-from isctest.text import compile_pattern, FlexPattern, LineReader
+from isctest.text import FlexPattern, LineReader, compile_pattern
 
 T = TypeVar("T")
 OneOrMore = Union[T, List[T]]

bin/tests/system/isctest/mark.py

@@ -11,11 +11,12 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import os
 from pathlib import Path
+
+import os
 import platform
-import socket
 import shutil
+import socket
 import subprocess
 
 import pytest

bin/tests/system/isctest/name.py

@@ -9,14 +9,14 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-from typing import Iterable, FrozenSet
-
-import dns.name
-import dns.zone
-import dns.rdatatype
+from typing import FrozenSet, Iterable
 
 from dns.name import Name
 
+import dns.name
+import dns.rdatatype
+import dns.zone
+
 
 def prepend_label(label: str, name: Name) -> Name:
     return Name((label,) + name.labels)

bin/tests/system/isctest/query.py

@@ -9,12 +9,13 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import os
-import time
 from typing import Any, Callable, Optional
 
-import dns.query
+import os
+import time
+
 import dns.message
+import dns.query
 
 import isctest.log
 

bin/tests/system/isctest/run.py

@@ -9,11 +9,12 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import os
 from pathlib import Path
+from typing import List, Optional
+
+import os
 import subprocess
 import time
-from typing import List, Optional
 
 import isctest.log
 import isctest.text

bin/tests/system/isctest/text.py

@@ -11,11 +11,12 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import abc
-import re
 from re import compile as Re
 from typing import Iterator, List, Match, Optional, Pattern, TextIO, Union
 
+import abc
+import re
+
 FlexPattern = Union[str, Pattern]
 
 

bin/tests/system/isctest/vars/__init__.py

@@ -11,11 +11,11 @@
 
 import os
 
-from .all import ALL
+from .. import log
 from .algorithms import init_crypto_supported, set_algorithm_set
+from .all import ALL
 from .features import init_features
 from .openssl import parse_openssl_config
-from .. import log
 
 
 def init_vars():

bin/tests/system/isctest/vars/algorithms.py

@@ -9,16 +9,17 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+from typing import Dict, List, NamedTuple, Optional, Union
+
 import os
 import platform
 import random
 import subprocess
 import tempfile
 import time
-from typing import Dict, List, NamedTuple, Optional, Union
 
-from .basic import BASIC_VARS
 from .. import log
+from .basic import BASIC_VARS
 
 # Algorithms are selected randomly at runtime from a list of supported
 # algorithms. The randomization is deterministic and remains stable for a

bin/tests/system/isctest/vars/all.py

@@ -11,8 +11,8 @@
 
 from collections import ChainMap
 
-from .autoconf import AC_VARS  # type: ignore
 from .algorithms import ALG_VARS, CRYPTO_SUPPORTED_VARS
+from .autoconf import AC_VARS  # type: ignore
 from .basic import BASIC_VARS
 from .dirs import DIR_VARS
 from .features import FEATURE_VARS

bin/tests/system/isctest/vars/basic.py

@@ -13,7 +13,6 @@ import os
 
 from .autoconf import AC_VARS  # type: ignore
 
-
 BASIC_VARS = {
     "ARPANAME": f"{AC_VARS['TOP_BUILDDIR']}/bin/tools/arpaname",
     "CDS": f"{AC_VARS['TOP_BUILDDIR']}/bin/dnssec/dnssec-cds",

bin/tests/system/isctest/vars/dirs.py

@@ -13,7 +13,6 @@ import os
 
 from .autoconf import AC_VARS  # type: ignore
 
-
 SYSTEM_TEST_DIR_GIT_PATH = "bin/tests/system"
 
 DIR_VARS = {

bin/tests/system/isctest/vars/openssl.py

@@ -9,10 +9,11 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import os
 from re import compile as Re
 from typing import Optional
 
+import os
+
 from .. import log
 
 OPENSSL_VARS = {

bin/tests/system/ixfr-nonminimal/ans2/ans.py

@@ -11,6 +11,8 @@ See the COPYRIGHT file distributed with this work for additional
 information regarding copyright ownership.
 """
 
+from typing import AsyncGenerator, Collection, Iterable
+
 import abc
 
 import dns.rcode
@@ -18,8 +20,6 @@ import dns.rdataclass
 import dns.rdatatype
 import dns.rrset
 
-from typing import AsyncGenerator, Collection, Iterable
-
 from isctest.asyncserver import (
     ControllableAsyncDnsServer,
     DnsResponseSend,

bin/tests/system/ixfr-nonminimal/ans4/ans.py

@@ -11,6 +11,8 @@ See the COPYRIGHT file distributed with this work for additional
 information regarding copyright ownership.
 """
 
+from typing import AsyncGenerator, Collection, Iterable
+
 import abc
 
 import dns.rcode
@@ -18,8 +20,6 @@ import dns.rdataclass
 import dns.rdatatype
 import dns.rrset
 
-from typing import AsyncGenerator, Collection, Iterable
-
 from isctest.asyncserver import (
     ControllableAsyncDnsServer,
     DnsResponseSend,

bin/tests/system/kasp/tests_kasp.py

@@ -9,26 +9,24 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+from datetime import timedelta
+
 import os
 import shutil
 import subprocess
 import time
 
-from datetime import timedelta
-
 import dns
 import dns.update
 import pytest
 
-import isctest
-import isctest.mark
-from isctest.kasp import (
-    KeyProperties,
-    KeyTimingMetadata,
-)
+from isctest.kasp import KeyProperties, KeyTimingMetadata
 from isctest.util import param
 from isctest.vars.algorithms import ECDSAP256SHA256, ECDSAP384SHA384
 
+import isctest
+import isctest.mark
+
 pytestmark = pytest.mark.extra_artifacts(
     [
         "K*.private",

bin/tests/system/keepalive/tests_keepalive.py

@@ -9,9 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import isctest
 import pytest
 
+import isctest
+
 pytestmark = pytest.mark.extra_artifacts(
     ["ns2/named.stats"],
 )

bin/tests/system/keyfromlabel/tests_keyfromlabel.py

@@ -9,9 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+from re import compile as Re
+
 import hashlib
 import os
-from re import compile as Re
 import shutil
 
 import pytest

bin/tests/system/ksr/tests_ksr.py

@@ -10,6 +10,7 @@
 # information regarding copyright ownership.
 
 from datetime import timedelta
+
 import os
 import re
 import shutil
@@ -17,9 +18,10 @@ import time
 
 import pytest
 
-import isctest
 from isctest.kasp import KeyTimingMetadata
 
+import isctest
+
 pytestmark = pytest.mark.extra_artifacts(
     [
         "K*",

bin/tests/system/limits/tests_limits.py

@@ -11,10 +11,10 @@
 
 import itertools
 
-import isctest
+import dns.rrset
 import pytest
 
-import dns.rrset
+import isctest
 
 
 @pytest.mark.parametrize(

bin/tests/system/migrate2kasp/tests_migrate2kasp.py

@@ -9,9 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import os
 from datetime import timedelta
 
+import os
+
 import pytest
 
 import isctest

bin/tests/system/multisigner/tests_multisigner.py

@@ -10,13 +10,13 @@
 # information regarding copyright ownership.
 
 from datetime import timedelta
-import os
 from re import compile as Re
 
-import pytest
+import os
 
 import dns
 import dns.update
+import pytest
 
 import isctest
 

bin/tests/system/nsec3-answer/tests_nsec3.py

@@ -16,11 +16,12 @@
 # pylint: disable=unreachable
 
 from dataclasses import dataclass
-import os
 from pathlib import Path
 from typing import Container, Iterable, Optional, Set, Tuple
 
-import pytest
+import os
+
+from hypothesis import assume, given
 
 import dns.dnssec
 import dns.message
@@ -29,16 +30,16 @@ import dns.query
 import dns.rcode
 import dns.rdataclass
 import dns.rdatatype
-import dns.rdtypes.ANY.RRSIG
 import dns.rdtypes.ANY.NSEC3
+import dns.rdtypes.ANY.RRSIG
 import dns.rrset
+import pytest
 
 from isctest.hypothesis.strategies import dns_names, sampled_from
+
 import isctest
 import isctest.name
 
-from hypothesis import assume, given
-
 SUFFIX = dns.name.from_text(".")
 AUTH = "10.53.0.1"
 RESOLVER = "10.53.0.2"

bin/tests/system/nsec3/common.py

@@ -9,10 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import os
-
 from datetime import timedelta
 
+import os
+
 import dns
 import pytest
 

bin/tests/system/nsec3/tests_nsec3_change.py

@@ -19,16 +19,11 @@ import dns
 import dns.update
 import pytest
 
+from isctest.vars.algorithms import RSASHA1
+from nsec3.common import ALGORITHM, SIZE, check_nsec3_case, default_config, pytestmark
+
 import isctest
 import isctest.mark
-from isctest.vars.algorithms import RSASHA1
-from nsec3.common import (
-    ALGORITHM,
-    SIZE,
-    default_config,
-    pytestmark,
-    check_nsec3_case,
-)
 
 # include the following zones when rendering named configs
 ZONES = {

bin/tests/system/nsec3/tests_nsec3_initial.py

@@ -17,16 +17,11 @@ import dns
 import dns.update
 import pytest
 
+from isctest.vars.algorithms import RSASHA1
+from nsec3.common import ALGORITHM, SIZE, check_nsec3_case, default_config, pytestmark
+
 import isctest
 import isctest.mark
-from isctest.vars.algorithms import RSASHA1
-from nsec3.common import (
-    ALGORITHM,
-    SIZE,
-    default_config,
-    pytestmark,
-    check_nsec3_case,
-)
 
 # include the following zones when rendering named configs
 ZONES = {

bin/tests/system/nsec3/tests_nsec3_reconfig.py

@@ -19,16 +19,11 @@ import dns
 import dns.update
 import pytest
 
+from isctest.vars.algorithms import RSASHA1
+from nsec3.common import ALGORITHM, SIZE, check_nsec3_case, default_config, pytestmark
+
 import isctest
 import isctest.mark
-from isctest.vars.algorithms import RSASHA1
-from nsec3.common import (
-    ALGORITHM,
-    SIZE,
-    default_config,
-    pytestmark,
-    check_nsec3_case,
-)
 
 # include the following zones when rendering named configs
 ZONES = {

bin/tests/system/nsec3/tests_nsec3_reload.py

@@ -18,12 +18,9 @@ import time
 import dns
 import pytest
 
+from nsec3.common import ALGORITHM, SIZE, check_nsec3_case
+
 import isctest
-from nsec3.common import (
-    ALGORITHM,
-    SIZE,
-    check_nsec3_case,
-)
 
 # include the following zones when rendering named configs
 ZONES = {

bin/tests/system/nsec3/tests_nsec3_restart.py

@@ -17,17 +17,18 @@ import dns
 import dns.update
 import pytest
 
-import isctest
-import isctest.mark
 from nsec3.common import (
     ALGORITHM,
     SIZE,
-    default_config,
-    pytestmark,
     check_nsec3_case,
     check_nsec3param,
+    default_config,
+    pytestmark,
 )
 
+import isctest
+import isctest.mark
+
 # include the following zones when rendering named configs
 ZONES = {
     "nsec3.kasp",

bin/tests/system/nsec3/tests_nsec3_retransfer.py

@@ -12,6 +12,7 @@
 # pylint: disable=redefined-outer-name,unused-import
 
 from datetime import timedelta
+
 import os
 import shutil
 
@@ -19,14 +20,11 @@ import dns
 import dns.update
 import pytest
 
+from isctest.vars.algorithms import RSASHA256
+from nsec3.common import check_auth_nsec3, check_nsec3param, pytestmark
+
 import isctest
 import isctest.mark
-from isctest.vars.algorithms import RSASHA256
-from nsec3.common import (
-    pytestmark,
-    check_auth_nsec3,
-    check_nsec3param,
-)
 
 DNSKEY_TTL = int(timedelta(hours=1).total_seconds())
 ZSK_LIFETIME = int(timedelta(days=90).total_seconds())

bin/tests/system/nsupdate/ans4/ans.py

@@ -9,11 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-from isctest.asyncserver import (
-    AsyncDnsServer,
-    IgnoreAllConnections,
-    IgnoreAllQueries,
-)
+from isctest.asyncserver import AsyncDnsServer, IgnoreAllConnections, IgnoreAllQueries
 
 
 def main() -> None:

bin/tests/system/nzd2nzf/tests_nzd2nzf.py

@@ -11,6 +11,7 @@
 
 
 import os
+
 import pytest
 
 import isctest

bin/tests/system/optout/tests_optout.py

@@ -16,9 +16,6 @@ import os
 import re
 import sys
 
-import isctest
-import pytest
-
 import dns
 import dns.exception
 import dns.message
@@ -27,6 +24,9 @@ import dns.query
 import dns.rcode
 import dns.rdataclass
 import dns.rdatatype
+import pytest
+
+import isctest
 
 pytestmark = [
     pytest.mark.skipif(

bin/tests/system/re_compile_checker.py

@@ -14,7 +14,6 @@
 import re
 
 from astroid import nodes
-
 from pylint.checkers import BaseRawFileChecker
 from pylint.lint import PyLinter
 

bin/tests/system/resolver/ans2/ans.py

@@ -15,8 +15,8 @@ from typing import AsyncGenerator, Tuple, Union
 
 import dns.name
 import dns.rcode
-import dns.rrset
 import dns.rdatatype
+import dns.rrset
 
 from isctest.asyncserver import (
     AsyncDnsServer,
@@ -26,8 +26,8 @@ from isctest.asyncserver import (
     QnameHandler,
     QnameQtypeHandler,
     QueryContext,
-    StaticResponseHandler,
     ResponseHandler,
+    StaticResponseHandler,
 )
 
 from ..resolver_ans import (

bin/tests/system/resolver/ans3/ans.py

@@ -25,8 +25,8 @@ from isctest.asyncserver import (
     QnameHandler,
     QnameQtypeHandler,
     QueryContext,
-    StaticResponseHandler,
     ResponseHandler,
+    StaticResponseHandler,
 )
 
 from ..resolver_ans import (

bin/tests/system/resolver/ans8/ans.py

@@ -11,10 +11,10 @@ See the COPYRIGHT file distributed with this work for additional
 information regarding copyright ownership.
 """
 
-import abc
-
 from typing import AsyncGenerator
 
+import abc
+
 import dns.flags
 import dns.message
 import dns.rcode
@@ -22,8 +22,8 @@ import dns.rdatatype
 
 from isctest.asyncserver import (
     AsyncDnsServer,
-    DnsResponseSend,
     DnsProtocol,
+    DnsResponseSend,
     DomainHandler,
     QnameHandler,
     QnameQtypeHandler,

bin/tests/system/rfc5011/tests_rfc5011.py

@@ -10,6 +10,7 @@
 # information regarding copyright ownership.
 
 import pytest
+
 from isctest.mark import live_internet_test
 
 pytestmark = pytest.mark.extra_artifacts(

bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_initial.py

@@ -13,20 +13,11 @@
 
 import pytest
 
-import isctest
 from isctest.util import param
-from rollover.common import (
-    pytestmark,
-    CDSS,
-    DURATION,
-    TIMEDELTA,
-    ALGOROLL_CONFIG,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_algo_csk,
-)
+from rollover.common import ALGOROLL_CONFIG, CDSS, DURATION, TIMEDELTA, pytestmark
+from rollover.setup import configure_algo_csk, configure_root, configure_tld
+
+import isctest
 
 POLICY = "csk-algoroll"
 

bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py

@@ -13,14 +13,9 @@
 
 import pytest
 
-import isctest
 from isctest.kasp import KeyTimingMetadata
 from isctest.util import param
 from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
     ALGOROLL_CONFIG,
     ALGOROLL_IPUB,
     ALGOROLL_IPUBC,
@@ -29,14 +24,16 @@ from rollover.common import (
     ALGOROLL_KEYTTLPROP,
     ALGOROLL_OFFSETS,
     ALGOROLL_OFFVAL,
+    CDSS,
     DURATION,
     TIMEDELTA,
+    alg,
+    pytestmark,
+    size,
 )
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_algo_csk,
-)
+from rollover.setup import configure_algo_csk, configure_root, configure_tld
+
+import isctest
 
 CONFIG = ALGOROLL_CONFIG
 POLICY = "csk-algoroll"

bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_initial.py

@@ -13,20 +13,11 @@
 
 import pytest
 
-import isctest
 from isctest.util import param
-from rollover.common import (
-    pytestmark,
-    CDSS,
-    DURATION,
-    TIMEDELTA,
-    ALGOROLL_CONFIG,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_algo_ksk_zsk,
-)
+from rollover.common import ALGOROLL_CONFIG, CDSS, DURATION, TIMEDELTA, pytestmark
+from rollover.setup import configure_algo_ksk_zsk, configure_root, configure_tld
+
+import isctest
 
 
 def bootstrap():

bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py

@@ -13,14 +13,9 @@
 
 import pytest
 
-import isctest
 from isctest.kasp import KeyTimingMetadata
 from isctest.util import param
 from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
     ALGOROLL_CONFIG,
     ALGOROLL_IPUB,
     ALGOROLL_IPUBC,
@@ -29,14 +24,16 @@ from rollover.common import (
     ALGOROLL_KEYTTLPROP,
     ALGOROLL_OFFSETS,
     ALGOROLL_OFFVAL,
+    CDSS,
     DURATION,
     TIMEDELTA,
+    alg,
+    pytestmark,
+    size,
 )
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_algo_ksk_zsk,
-)
+from rollover.setup import configure_algo_ksk_zsk, configure_root, configure_tld
+
+import isctest
 
 CONFIG = ALGOROLL_CONFIG
 POLICY = "ecdsa256"

bin/tests/system/rollover-csk-roll1/tests_rollover_csk_roll1.py

@@ -15,20 +15,12 @@ from datetime import timedelta
 
 import pytest
 
-import isctest
 from isctest.kasp import Ipub, Iret
 from isctest.util import param
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    TIMEDELTA,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_cskroll1,
-)
+from rollover.common import TIMEDELTA, alg, pytestmark, size
+from rollover.setup import configure_cskroll1, configure_root, configure_tld
+
+import isctest
 
 CDSS = ["CDNSKEY", "CDS (SHA-384)"]
 CONFIG = {

bin/tests/system/rollover-csk-roll2/tests_rollover_csk_roll2.py

@@ -15,20 +15,12 @@ from datetime import timedelta
 
 import pytest
 
-import isctest
 from isctest.kasp import Ipub, Iret
 from isctest.util import param
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    TIMEDELTA,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_cskroll2,
-)
+from rollover.common import TIMEDELTA, alg, pytestmark, size
+from rollover.setup import configure_cskroll2, configure_root, configure_tld
+
+import isctest
 
 CDSS = ["CDNSKEY", "CDS (SHA-256)", "CDS (SHA-384)"]
 CONFIG = {

bin/tests/system/rollover-dynamic2inline/tests_rollover_dynamic2inline.py

@@ -11,14 +11,9 @@
 
 # pylint: disable=redefined-outer-name,unused-import
 
+from rollover.common import CDSS, DEFAULT_CONFIG, alg, pytestmark, size
+
 import isctest
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
-    DEFAULT_CONFIG,
-)
 
 
 def test_dynamic2inline(alg, size, ns3, templates):

bin/tests/system/rollover-enable-dnssec/tests_rollover_enable_dnssec.py

@@ -13,21 +13,12 @@
 
 import pytest
 
-import isctest
 from isctest.kasp import Ipub, IpubC, Iret
 from isctest.util import param
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
-    TIMEDELTA,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_enable_dnssec,
-)
+from rollover.common import CDSS, TIMEDELTA, alg, pytestmark, size
+from rollover.setup import configure_enable_dnssec, configure_root, configure_tld
+
+import isctest
 
 CONFIG = {
     "dnskey-ttl": TIMEDELTA["PT5M"],

bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_initial.py

@@ -13,20 +13,10 @@
 
 import pytest
 
+from rollover.common import CDSS, DURATION, UNSIGNING_CONFIG, alg, pytestmark, size
+from rollover.setup import configure_going_insecure, configure_root, configure_tld
+
 import isctest
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
-    DURATION,
-    UNSIGNING_CONFIG,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_going_insecure,
-)
 
 
 def bootstrap():

bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py

@@ -13,21 +13,18 @@
 
 import pytest
 
-import isctest
 from rollover.common import (
-    pytestmark,
-    alg,
-    size,
     CDSS,
     DEFAULT_CONFIG,
     DURATION,
     UNSIGNING_CONFIG,
+    alg,
+    pytestmark,
+    size,
 )
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_going_insecure,
-)
+from rollover.setup import configure_going_insecure, configure_root, configure_tld
+
+import isctest
 
 
 def bootstrap():

bin/tests/system/rollover-ksk-3crowd/tests_rollover_three_is_a_crowd.py

@@ -13,22 +13,19 @@
 
 from datetime import timedelta
 
-import isctest
 from isctest.kasp import KeyTimingMetadata
 from rollover.common import (
-    pytestmark,
-    alg,
-    size,
     KSK_CONFIG,
-    KSK_LIFETIME_POLICY,
     KSK_IPUB,
     KSK_IRET,
+    KSK_LIFETIME_POLICY,
+    alg,
+    pytestmark,
+    size,
 )
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_ksk_3crowd,
-)
+from rollover.setup import configure_ksk_3crowd, configure_root, configure_tld
+
+import isctest
 
 CDSS = ["CDS (SHA-256)"]
 POLICY = "ksk-doubleksk-autosign"

bin/tests/system/rollover-ksk-doubleksk/tests_rollover_ksk_doubleksk.py

@@ -15,26 +15,23 @@ from datetime import timedelta
 
 import pytest
 
-import isctest
 from isctest.util import param
 from rollover.common import (
-    pytestmark,
-    alg,
-    size,
     KSK_CONFIG,
-    KSK_LIFETIME,
-    KSK_LIFETIME_POLICY,
     KSK_IPUB,
     KSK_IPUBC,
     KSK_IRET,
     KSK_KEYTTLPROP,
+    KSK_LIFETIME,
+    KSK_LIFETIME_POLICY,
     TIMEDELTA,
+    alg,
+    pytestmark,
+    size,
 )
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_ksk_doubleksk,
-)
+from rollover.setup import configure_ksk_doubleksk, configure_root, configure_tld
+
+import isctest
 
 CDSS = ["CDS (SHA-256)"]
 POLICY = "ksk-doubleksk"

bin/tests/system/rollover-lifetime/tests_rollover_lifetime_initial.py

@@ -13,16 +13,10 @@
 
 import pytest
 
-import isctest
 from isctest.util import param
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
-    DEFAULT_CONFIG,
-    DURATION,
-)
+from rollover.common import CDSS, DEFAULT_CONFIG, DURATION, alg, pytestmark, size
+
+import isctest
 
 
 @pytest.mark.parametrize(

bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py

@@ -13,16 +13,10 @@
 
 import pytest
 
-import isctest
 from isctest.util import param
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
-    DEFAULT_CONFIG,
-    DURATION,
-)
+from rollover.common import CDSS, DEFAULT_CONFIG, DURATION, alg, pytestmark, size
+
+import isctest
 
 
 @pytest.fixture(scope="module", autouse=True)

bin/tests/system/rollover-multisigner/tests_rollover_multisigner.py

@@ -12,23 +12,20 @@
 # pylint: disable=redefined-outer-name,unused-import
 
 from datetime import timedelta
-import os
 
-import pytest
+import os
 
 import dns
 import dns.update
+import pytest
 
-import isctest
 from isctest.kasp import Iret
 from isctest.run import EnvCmd
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-)
+from rollover.common import alg, pytestmark, size
 from rollover.setup import fake_lifetime, render_and_sign_zone
 
+import isctest
+
 
 def bootstrap():
     templates = isctest.template.TemplateEngine(".")

bin/tests/system/rollover-straight2none/tests_rollover_straight2none_initial.py

@@ -13,20 +13,10 @@
 
 import pytest
 
+from rollover.common import CDSS, DEFAULT_CONFIG, DURATION, alg, pytestmark, size
+from rollover.setup import configure_root, configure_straight2none, configure_tld
+
 import isctest
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
-    DURATION,
-    DEFAULT_CONFIG,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_straight2none,
-)
 
 
 def bootstrap():

bin/tests/system/rollover-straight2none/tests_rollover_straight2none_reconfig.py

@@ -13,20 +13,10 @@
 
 import pytest
 
+from rollover.common import CDSS, DEFAULT_CONFIG, DURATION, alg, pytestmark, size
+from rollover.setup import configure_root, configure_straight2none, configure_tld
+
 import isctest
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    CDSS,
-    DURATION,
-    DEFAULT_CONFIG,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_straight2none,
-)
 
 
 def bootstrap():

bin/tests/system/rollover-zsk-prepub/tests_rollover_zsk_prepublication.py

@@ -15,20 +15,12 @@ from datetime import timedelta
 
 import pytest
 
-import isctest
 from isctest.kasp import Ipub, Iret
 from isctest.util import param
-from rollover.common import (
-    pytestmark,
-    alg,
-    size,
-    TIMEDELTA,
-)
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-    configure_zsk_prepub,
-)
+from rollover.common import TIMEDELTA, alg, pytestmark, size
+from rollover.setup import configure_root, configure_tld, configure_zsk_prepub
+
+import isctest
 
 CONFIG = {
     "dnskey-ttl": TIMEDELTA["PT1H"],

bin/tests/system/rollover/common.py

@@ -10,6 +10,7 @@
 # information regarding copyright ownership.
 
 from datetime import timedelta
+
 import os
 
 import pytest

bin/tests/system/rollover/setup.py

@@ -9,15 +9,17 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-import shutil
 from typing import List
 
-import isctest
+import shutil
+
 from isctest.kasp import private_type_record
-from isctest.template import Nameserver, TrustAnchor, Zone
 from isctest.run import EnvCmd
+from isctest.template import Nameserver, TrustAnchor, Zone
 from rollover.common import default_algorithm
 
+import isctest
+
 
 def configure_tld(zonename: str, delegations: List[Zone]) -> Zone:
     templates = isctest.template.TemplateEngine(".")

bin/tests/system/rollover/tests_rollover_manual.py

@@ -10,18 +10,16 @@
 # information regarding copyright ownership.
 
 from datetime import timedelta
+
 import os
 
-import isctest
-from isctest.kasp import KeyTimingMetadata, Ipub, Iret, private_type_record
-from isctest.template import Nameserver, Zone
+from isctest.kasp import Ipub, Iret, KeyTimingMetadata, private_type_record
 from isctest.run import EnvCmd
-
+from isctest.template import Nameserver, Zone
 from rollover.common import default_algorithm
-from rollover.setup import (
-    configure_root,
-    configure_tld,
-)
+from rollover.setup import configure_root, configure_tld
+
+import isctest
 
 
 def setup_zone(zone, ksk_time, ksk_settime, zsk_time, zsk_settime) -> Zone:

bin/tests/system/rpzextra/tests_rpzextra.py

@@ -13,11 +13,10 @@
 
 import os
 
-import pytest
-
 import dns
 import dns.rcode
 import dns.rrset
+import pytest
 
 import isctest
 

bin/tests/system/selftest/tests_zone_analyzer.py

@@ -14,13 +14,15 @@ isctest.name.ZoneAnalyzer self-test
 Generate insane test zone and check expected output of ZoneAnalyzer utility class
 """
 
+from pathlib import Path
+
 import collections
 import itertools
-from pathlib import Path
+
+from dns.name import Name
 
 import dns
 import dns.name
-from dns.name import Name
 import pytest
 
 import isctest

bin/tests/system/shutdown/tests_shutdown.py

@@ -12,17 +12,17 @@
 # information regarding copyright ownership.
 
 from concurrent.futures import ThreadPoolExecutor, as_completed
+from string import ascii_lowercase as letters
+
 import os
 import random
 import signal
 import subprocess
-from string import ascii_lowercase as letters
 import time
 
-import pytest
-
 import dns
 import dns.exception
+import pytest
 
 import isctest
 

bin/tests/system/sortlist/tests_sortlist.py

@@ -10,7 +10,6 @@
 # information regarding copyright ownership.
 
 import dns.message
-
 import pytest
 
 import isctest

bin/tests/system/statschannel/generic.py

@@ -9,9 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-from datetime import datetime, timedelta
 from collections import defaultdict
+from datetime import datetime, timedelta
 from time import sleep
+
 import os
 
 import dns.message