mirror of
https://github.com/isc-projects/bind9.git
synced 2026-05-28 04:34:54 -04:00
Remove hypothesis version checks
The minimum required hypothesis version has been set in requirements.txt
and no longer needs to be checked at runtime.
Since the hypothesis package is now a mandatory prerequisite, include it
in isctest as the other subpackages.
(cherry picked from commit 1291fa1a6d)
This commit is contained in:
parent
5c931d8045
commit
fe1b33fb7e
2 changed files with 1 additions and 16 deletions
|
|
@ -11,6 +11,7 @@
|
|||
|
||||
from . import check
|
||||
from . import instance
|
||||
from . import hypothesis
|
||||
from . import query
|
||||
from . import kasp
|
||||
from . import run
|
||||
|
|
@ -18,10 +19,6 @@ from . import template
|
|||
from . import log
|
||||
from . import vars # pylint: disable=redefined-builtin
|
||||
|
||||
# isctest.hypothesis is intentionally NOT imported, because it detects proper
|
||||
# hypothesis support and instructs pytest to skip the tests otherwise. It
|
||||
# should be manually imported only in the modules that require hypothesis.
|
||||
|
||||
# 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
|
||||
# `isctest` package. To use the marks, manual `import isctest.mark` is needed
|
||||
|
|
|
|||
|
|
@ -12,17 +12,5 @@
|
|||
# This ensures we're using a suitable hypothesis version. A newer version is
|
||||
# required for FIPS-enabled platforms.
|
||||
|
||||
import hashlib
|
||||
|
||||
import pytest
|
||||
|
||||
MIN_HYPOTHESIS_VERSION = None
|
||||
|
||||
if "md5" not in hashlib.algorithms_available:
|
||||
# FIPS mode is enabled, use hypothesis 4.41.2 which doesn't use md5
|
||||
MIN_HYPOTHESIS_VERSION = "4.41.2"
|
||||
|
||||
pytest.importorskip("hypothesis", minversion=MIN_HYPOTHESIS_VERSION)
|
||||
|
||||
from . import settings
|
||||
from . import strategies
|
||||
|
|
|
|||
Loading…
Reference in a new issue