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.

diff --git a/bin/tests/system/isctest/__init__.py b/bin/tests/system/isctest/__init__.py
index ce0dd75508ca16adf49c7e602bb6f52ab2b41957..4b5f299376ab94389def30ce6c428ecf15580422 100644 (file)
--- a/bin/tests/system/isctest/__init__.py
+++ b/bin/tests/system/isctest/__init__.py
@@ -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

diff --git a/bin/tests/system/isctest/hypothesis/__init__.py b/bin/tests/system/isctest/hypothesis/__init__.py
index 4cedd8866af7aa65a75504d061000511bc1f18db..6c2cc00210fbb24ac746f91368c6da51bea6f91b 100644 (file)
--- a/bin/tests/system/isctest/hypothesis/__init__.py
+++ b/bin/tests/system/isctest/hypothesis/__init__.py
@@ -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