components/python/pytest-timeout/Makefile
@@ -19,26 +19,22 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME = pytest-timeout HUMAN_VERSION = 2.2.0 HUMAN_VERSION = 2.3.1 COMPONENT_SUMMARY = pytest-timeout - pytest plugin to abort hanging tests COMPONENT_PROJECT_URL = https://github.com/pytest-dev/pytest-timeout COMPONENT_ARCHIVE_URL = \ https://files.pythonhosted.org/packages/2a/b0/8e3182e9ed65ad5b247f9d13769f214fc52b0d3522c3e1c8dbfa2f879e5a/pytest-timeout-2.2.0.tar.gz COMPONENT_ARCHIVE_HASH = \ sha256:3b0b95dabf3cb50bac9ef5ca912fa0cfc286526af17afc806824df20c2f72c90 sha256:12397729125c6ecbdaca01035b9e5239d4db97352320af155b3f5de1ba5165d9 COMPONENT_LICENSE = MIT COMPONENT_LICENSE_FILE = LICENSE include $(WS_MAKE_RULES)/common.mk # The test_suppresses_timeout_when_debugger_is_entered test uses spawn_pytest() # to execute tests. The spawn_pytest() have no support for passing additional # pytest options (see also https://github.com/pytest-dev/pytest/pull/7207) so # we cannot disable some toxic pytest plugins (black and mypy in this case) as # we usually do using the "-p no:PLUGIN" option. To have tests pass we need to # make sure both pytest-black and pytest-mypy are not installed during testing. TEST_CONFLICTING_PACKAGES.python += library/python/pytest-black TEST_CONFLICTING_PACKAGES.python += library/python/pytest-mypy # The xfailures traceback contains random data PYTEST_TRACEBACK = --tb=no # https://github.com/pytest-dev/pluggy/issues/457 TEST_CONFLICTING_PACKAGES.python += library/python/faker TEST_CONFLICTING_PACKAGES.python += library/python/pytest-enabler # Auto-generated dependencies PYTHON_REQUIRED_PACKAGES += library/python/pytest components/python/pytest-timeout/history
@@ -1 +1 @@ library/python/pytest-timeout-37@2.0.2,5.11-2022.0.0.2 noincorporate library/python/pytest-timeout-37@2.0.2,5.11-2022.0.0.3 components/python/pytest-timeout/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@ # # # Copyright 2023 <contributor> # Copyright 2024 <contributor> # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) components/python/pytest-timeout/patches/01-no-pytest-github-actions-annotate-failures.patch
@@ -1,7 +1,7 @@ This test requirement is superfluous. --- pytest-timeout-2.2.0/tox.ini.orig +++ pytest-timeout-2.2.0/tox.ini --- pytest-timeout-2.3.1/tox.ini.orig +++ pytest-timeout-2.3.1/tox.ini @@ -10,7 +10,6 @@ pexpect ipdb components/python/pytest-timeout/pkg5
@@ -6,8 +6,8 @@ "runtime/python-39" ], "fmris": [ "library/python/pytest-timeout-39", "library/python/pytest-timeout" "library/python/pytest-timeout", "library/python/pytest-timeout-39" ], "name": "pytest-timeout" } } components/python/pytest-timeout/python-integrate-project.conf
@@ -16,11 +16,9 @@ %patch% 01-no-pytest-github-actions-annotate-failures.patch %include-3% # The test_suppresses_timeout_when_debugger_is_entered test uses spawn_pytest() # to execute tests. The spawn_pytest() have no support for passing additional # pytest options (see also https://github.com/pytest-dev/pytest/pull/7207) so # we cannot disable some toxic pytest plugins (black and mypy in this case) as # we usually do using the "-p no:PLUGIN" option. To have tests pass we need to # make sure both pytest-black and pytest-mypy are not installed during testing. TEST_CONFLICTING_PACKAGES.python += library/python/pytest-black TEST_CONFLICTING_PACKAGES.python += library/python/pytest-mypy # The xfailures traceback contains random data PYTEST_TRACEBACK = --tb=no # https://github.com/pytest-dev/pluggy/issues/457 TEST_CONFLICTING_PACKAGES.python += library/python/faker TEST_CONFLICTING_PACKAGES.python += library/python/pytest-enabler components/python/pytest-timeout/test/results-all.master
@@ -5,7 +5,7 @@ cachedir: .tox/py$(PYV)/.pytest_cache rootdir: $(@D) configfile: tox.ini collecting ... collected 45 items collecting ... collected 47 items test_pytest_timeout.py::test_cov PASSED test_pytest_timeout.py::test_disable_debugger_detection_flag[ipdb-set_trace()] XFAIL @@ -31,13 +31,15 @@ test_pytest_timeout.py::test_fix_setup_func_only PASSED test_pytest_timeout.py::test_header PASSED test_pytest_timeout.py::test_ini_method PASSED test_pytest_timeout.py::test_ini_session_timeout PASSED test_pytest_timeout.py::test_ini_timeout PASSED test_pytest_timeout.py::test_ini_timeout_func_only PASSED test_pytest_timeout.py::test_ini_timeout_func_only_marker_override PASSED test_pytest_timeout.py::test_is_debugging PASSED test_pytest_timeout.py::test_marker_help PASSED test_pytest_timeout.py::test_not_main_thread PASSED test_pytest_timeout.py::test_not_main_thread SKIPPED (The 'pytest_ti...) test_pytest_timeout.py::test_plugin_interface PASSED test_pytest_timeout.py::test_session_timeout PASSED test_pytest_timeout.py::test_sigalrm PASSED test_pytest_timeout.py::test_suppresses_timeout_when_debugger_is_entered[ipdb-set_trace()] XFAIL test_pytest_timeout.py::test_suppresses_timeout_when_debugger_is_entered[pdb-set_trace()] PASSED @@ -53,8 +55,7 @@ test_pytest_timeout.py::test_timeout_mark_timer PASSED test_pytest_timeout.py::test_timeout_marker_inheritance PASSED =========================== short test summary info ============================ ======== 41 passed, 4 xfailed ======== ======== 42 passed, 1 skipped, 4 xfailed ======== py$(PYV): OK congratulations :)
