import pytest
-# isctest.asyncserver requires dnspython >= 2.0.0
-pytest.importorskip("dns", minversion="2.0.0")
-
import isctest
from isctest.instance import NamedInstance
import isctest
import pytest
-pytest.importorskip("dns", minversion="2.0.0")
import dns.exception
import dns.message
import dns.name
import pytest
import isctest
-pytest.importorskip("dns")
import dns.message
pytestmark = pytest.mark.extra_artifacts(
import pytest
pytest.importorskip("cryptography")
-pytest.importorskip(
- "dns", minversion="2.7.0"
-) # dns.dnssec.sign_zone(deterministic=...) needed
from cryptography.hazmat.primitives.asymmetric import ec
import isctest
import pytest
-pytest.importorskip("dns", minversion="2.0.0")
import dns.rrset
pytestmark = pytest.mark.extra_artifacts(
import pytest
-pytest.importorskip("dns")
+import dns
import dns.exception
import dns.name
import dns.rdataclass
import dns.flags
import dns.message
-import pytest
import isctest
-pytest.importorskip("dns", minversion="2.0.0")
-
def test_glue_full_glue_set():
"""test that a ccTLD referral gets a full glue set from the root zone"""
tcp_handler: Optional[_TcpHandler],
pidfile: Optional[str] = None,
) -> None:
- self._abort_if_on_dnspython_version_less_than_2_0_0()
logging.basicConfig(
format="%(asctime)s %(levelname)8s %(message)s",
level=os.environ.get("ANS_LOG_LEVEL", "INFO").upper(),
self._pidfile: Optional[str] = pidfile
self._work_done: Optional[asyncio.Future] = None
- @classmethod
- def _abort_if_on_dnspython_version_less_than_2_0_0(cls) -> None:
- if dns.version.MAJOR < 2:
- error = f"Using {cls.__name__} requires dnspython >= 2.0.0; "
- error += 'add `pytest.importorskip("dns", minversion="2.0.0")` '
- error += "to the test module to skip this test."
- raise RuntimeError(error)
-
def _get_ipv4_address_from_directory_name(self) -> str:
containing_directory = pathlib.Path().absolute().stem
match_result = re.match(r"ans(?P<index>\d+)", containing_directory)
from typing import cast, List, Optional
import dns.edns
+from dns.edns import EDECode, EDEOption
import dns.flags
import dns.message
import dns.rcode
import dns.zone
import isctest.log
-from isctest.compat import dns_rcode, EDECode, EDEOption
def rcode(message: dns.message.Message, expected_rcode) -> None:
def noerror(message: dns.message.Message) -> None:
- rcode(message, dns_rcode.NOERROR)
+ rcode(message, dns.rcode.NOERROR)
def notimp(message: dns.message.Message) -> None:
- rcode(message, dns_rcode.NOTIMP)
+ rcode(message, dns.rcode.NOTIMP)
def refused(message: dns.message.Message) -> None:
- rcode(message, dns_rcode.REFUSED)
+ rcode(message, dns.rcode.REFUSED)
def servfail(message: dns.message.Message) -> None:
- rcode(message, dns_rcode.SERVFAIL)
+ rcode(message, dns.rcode.SERVFAIL)
def adflag(message: dns.message.Message) -> None:
def noede(message: dns.message.Message) -> None:
"""Check that message contains no EDE option."""
- if not hasattr(dns.edns, "EDECode"):
- # dnspython<2.2.0 doesn't support EDE, skip check
- return
-
ede_options = _extract_ede_options(message)
assert not ede_options, f"unexpected EDE options {ede_options} in {message}"
message: dns.message.Message, code: EDECode, text: Optional[str] = None
) -> None:
"""Check if message contains expected EDE code (and its text)."""
- if not hasattr(dns.edns, "EDECode"):
- # dnspython<2.2.0 doesn't support EDE, skip check
- return
-
msg_opts = _extract_ede_options(message)
matching_opts = [opt for opt in msg_opts if opt.code == code]
def named_alive(named_proc, resolver_ip):
assert named_proc.poll() is None, "named isn't running"
msg = isctest.query.create("version.bind", "TXT", "CH")
- isctest.query.tcp(msg, resolver_ip, expected_rcode=dns_rcode.NOERROR)
+ isctest.query.tcp(msg, resolver_ip, expected_rcode=dns.rcode.NOERROR)
def notauth(message: dns.message.Message) -> None:
+++ /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.
-
-from typing import Any, TYPE_CHECKING
-
-import dns.edns
-import dns.rcode
-
-# compatiblity with dnspython<2.0.0
-try:
- # In dnspython>=2.0.0, dns.rcode.Rcode class is available
- # pylint: disable=invalid-name
- dns_rcode = dns.rcode.Rcode # type: Any
-except AttributeError:
- # In dnspython<2.0.0, selected rcodes are available as integers directly
- # from dns.rcode
- dns_rcode = dns.rcode
-
-
-if TYPE_CHECKING:
- EDECode = dns.edns.EDECode
- EDEOption = dns.edns.EDEOption
-else:
- try: # compatiblity with dnspython<2.2.0
- EDECode = dns.edns.EDECode
- except AttributeError:
- # In dnspython<2.2.0, the dns.edns.EDECode doesn't exist.
- #
- # The primary use-case is for us to use existing EDECode objects from the
- # class, e.g. EDECode.FILTERED. To mimick this behavior, use a string
- # factory that just turns the attribute name into a string.
- #
- # The used compatibility hack doesn't really matter (as long as EDECode.xxx
- # doesn't raise exception), as with dnspython versions prior to 2.2.0, any
- # EDE checking will be skipped anyway.
- class _CompatEDECode:
- def __getattr__(self, name: str) -> str:
- return name
-
- EDECode = _CompatEDECode()
- try:
- EDEOption = dns.edns.EDEOption
- except AttributeError:
- # In dnspython<2.2.0, the dns.edns.EDEOption doesn't exist, so we stub it to be
- # able to use it in type annotations.
- class EDEOption:
- def __new__(cls, *args, **kwargs):
- raise RuntimeError("Using EDEOption requires dnspython>=2.2.0")
RDATACLASS_MAX = RDATATYPE_MAX = 65535
-try:
- dns_rdataclasses = builds(dns.rdataclass.RdataClass, integers(0, RDATACLASS_MAX))
- dns_rdatatypes = builds(dns.rdatatype.RdataType, integers(0, RDATATYPE_MAX))
-except AttributeError:
- # In old dnspython versions, RDataTypes and RDataClasses are int and not enums.
- dns_rdataclasses = integers(0, RDATACLASS_MAX) # type: ignore
- dns_rdatatypes = integers(0, RDATATYPE_MAX) # type: ignore
+dns_rdataclasses = builds(dns.rdataclass.RdataClass, integers(0, RDATACLASS_MAX))
+dns_rdatatypes = builds(dns.rdatatype.RdataType, integers(0, RDATATYPE_MAX))
dns_rdataclasses_without_meta = dns_rdataclasses.filter(dns.rdataclass.is_metaclass)
# NOTE: This should really be `dns_rdatatypes_without_meta = dns_rdatatypes_without_meta.filter(dns.rdatatype.is_metatype()`,
from typing import Container, Iterable, FrozenSet
-import pytest
-
-pytest.importorskip("dns", minversion="2.3.0") # NameRelation
from dns.name import Name, NameRelation
import dns.zone
import dns.rdatatype
import dns.message
import isctest.log
-from isctest.compat import dns_rcode
QUERY_TIMEOUT = 10
source: Optional[str] = None,
timeout: int = QUERY_TIMEOUT,
attempts: int = 10,
- expected_rcode: dns_rcode = None,
+ expected_rcode: Optional[dns.rcode.Rcode] = None,
log_query: bool = True,
log_response: bool = True,
) -> Any:
return res
time.sleep(1)
if expected_rcode is not None:
- last_rcode = dns_rcode.to_text(res.rcode()) if res else None
+ last_rcode = dns.rcode.to_text(res.rcode()) if res else None
isctest.log.debug(
- f"isc.query.{query_func.__name__}(): expected rcode={dns_rcode.to_text(expected_rcode)}, last rcode={last_rcode}"
+ f"isc.query.{query_func.__name__}(): expected rcode={dns.rcode.to_text(expected_rcode)}, last rcode={last_rcode}"
)
raise dns.exception.Timeout
import isctest.log
import isctest.text
-from isctest.compat import dns_rcode
import dns.message
+import dns.rcode
class CmdResult:
def assert_custom_named_is_alive(named_proc, resolver_ip):
assert named_proc.poll() is None, "named isn't running"
msg = dns.message.make_query("version.bind", "TXT", "CH")
- isctest.query.tcp(msg, resolver_ip, expected_rcode=dns_rcode.NOERROR)
+ isctest.query.tcp(msg, resolver_ip, expected_rcode=dns.rcode.NOERROR)
import isctest
import pytest
-# Everything from getting a big answer to creating an RR set with thousands
-# of records takes minutes of CPU and real time with dnspython < 2.0.0.
-pytest.importorskip("dns", minversion="2.0.0")
import dns.rrset
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
-import pytest
-
-pytest.importorskip("dns", minversion="2.7.0")
-
import isctest
import pytest
-pytest.importorskip("dns", minversion="2.5.0")
import dns.dnssec
import dns.message
import dns.name
import isctest
import pytest
-pytest.importorskip("dns", minversion="2.0.0")
+import dns
import dns.exception
import dns.message
import dns.name
import pytest
-pytest.importorskip("dns", minversion="2.0.0")
+import dns
import dns.rcode
import dns.rrset
import isctest
-from isctest.compat import dns_rcode
pytestmark = pytest.mark.extra_artifacts(
msg,
ip="10.53.0.3",
source="10.53.0.2",
- expected_rcode=dns_rcode.NOERROR,
+ expected_rcode=dns.rcode.NOERROR,
)
isctest.query.tcp(
msg,
ip="10.53.0.3",
source="10.53.0.5",
- expected_rcode=dns_rcode.NOERROR,
+ expected_rcode=dns.rcode.NOERROR,
)
msg = isctest.query.create(qname, "A")
import pytest
-pytest.importorskip("dns", minversion="2.0.0")
+import dns
import dns.exception
import isctest
from datetime import datetime
import pytest
+import requests
import isctest.mark
pytest.register_assert_rewrite("generic")
import generic
-requests = pytest.importorskip("requests")
pytestmark = [
isctest.mark.have_json_c,
import xml.etree.ElementTree as ET
import pytest
+import requests
import isctest.mark
pytest.register_assert_rewrite("generic")
import generic
-requests = pytest.importorskip("requests")
pytestmark = [
isctest.mark.have_libxml2,
import pytest
-pytest.importorskip("dns", minversion="2.0.0")
+import dns
import dns.message
import dns.query
import pytest
-pytest.importorskip("dns", minversion="2.0.0")
+import dns
import dns.edns
import dns.message
import dns.name
import pytest
-pytest.importorskip("dns", minversion="2.7.0") # TSIG parsing without validation
-
import dns.exception
import dns.message
import dns.name
import isctest
-pytest.importorskip("dns")
+import dns
import dns.message
import dns.name
import dns.rdata
import pytest
-pytest.importorskip("dns", minversion="2.0.0")
+import dns
import dns.message
import dns.name
import dns.query
projects / thirdparty / bind9.git / commitdiff
