From 39e1eac692aa5d0405da3fadbe65455637960e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= Date: Tue, 30 Dec 2025 14:46:23 +0100 Subject: [PATCH] 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 1291fa1a6da2b4fc52a779a326c438e758e103a8) --- bin/tests/system/isctest/__init__.py | 5 +---- bin/tests/system/isctest/hypothesis/__init__.py | 12 ------------ 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/bin/tests/system/isctest/__init__.py b/bin/tests/system/isctest/__init__.py index 27b915d672..4af893202b 100644 --- a/bin/tests/system/isctest/__init__.py +++ b/bin/tests/system/isctest/__init__.py @@ -11,15 +11,12 @@ from . import check from . import instance +from . import hypothesis from . import query from . import run from . import template from . import log -# 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 4cedd8866a..6c2cc00210 100644 --- 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