From a01ada64ae804519428d404d2fa0784392bc36ec Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Mon, 15 Apr 2024 21:11:29 -0400 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A7=AA=20Stop=20using=20`pytest-forke?= =?UTF-8?q?d`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This plugin is incompatible with Pytest 7+, it's difficult to fix upstream and there is no timeline for addressing that. The patch also bumps the top version boundary of Pytest to 7.2 due to the pinned `pytest-cov` raising warnings. Fixes #502 Resolves #511 Closes #680 Resolves #681 --- cheroot/test/test_server.py | 9 --------- requirements/tests.in | 9 +++------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/cheroot/test/test_server.py b/cheroot/test/test_server.py index e2e5f788c7..3c39773119 100644 --- a/cheroot/test/test_server.py +++ b/cheroot/test/test_server.py @@ -400,15 +400,6 @@ def test_reuse_port(http_server, ip_addr, mocker): assert spy.spy_exception is None -ISSUE511 = IS_MACOS - - -if not IS_WINDOWS and not ISSUE511: - test_high_number_of_file_descriptors = pytest.mark.forked( - test_high_number_of_file_descriptors, - ) - - @pytest.fixture def _garbage_bin(): """Disable garbage collection when this fixture is in use.""" diff --git a/requirements/tests.in b/requirements/tests.in index 7192fdff71..9b3f4070ed 100644 --- a/requirements/tests.in +++ b/requirements/tests.in @@ -34,18 +34,15 @@ pypytools pytest-clarity pytest-cov==2.12.0 -pytest-forked>=1.2.0; sys_platform != "win32" pytest-mock>=1.11.0 pytest-rerunfailures pytest-sugar>=0.9.3 pytest-watch==4.2.0 pytest-xdist>=1.28.0 -# pytest-forked is currently incompatible with pytest 7 -# Refs: -# * https://github.com/cherrypy/cheroot/issues/511 -# * https://github.com/pytest-dev/pytest-forked/issues/67 -pytest >= 4.6.6, < 7 +# pytest 7.2 introduces deprecations triggered by pytest-cov +# * https://github.com/cherrypy/cheroot/issues/682 +pytest >= 7, <7.2 # HTTP over UNIX socket requests-unixsocket From 32e09b4287fc9f6a9899fa6b344c5f51900bea46 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Sat, 27 Apr 2024 04:42:11 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=93=9D=20Add=20a=20change=20note=20fo?= =?UTF-8?q?r=20PR=20#703?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This also links several related issues. --- docs/changelog-fragments.d/502.contrib.rst | 1 + docs/changelog-fragments.d/511.contrib.rst | 1 + docs/changelog-fragments.d/680.contrib.rst | 1 + docs/changelog-fragments.d/681.contrib.rst | 1 + docs/changelog-fragments.d/703.contrib.rst | 15 +++++++++++++++ 5 files changed, 19 insertions(+) create mode 120000 docs/changelog-fragments.d/502.contrib.rst create mode 120000 docs/changelog-fragments.d/511.contrib.rst create mode 120000 docs/changelog-fragments.d/680.contrib.rst create mode 120000 docs/changelog-fragments.d/681.contrib.rst create mode 100644 docs/changelog-fragments.d/703.contrib.rst diff --git a/docs/changelog-fragments.d/502.contrib.rst b/docs/changelog-fragments.d/502.contrib.rst new file mode 120000 index 0000000000..c5e87d4ac3 --- /dev/null +++ b/docs/changelog-fragments.d/502.contrib.rst @@ -0,0 +1 @@ +703.contrib.rst \ No newline at end of file diff --git a/docs/changelog-fragments.d/511.contrib.rst b/docs/changelog-fragments.d/511.contrib.rst new file mode 120000 index 0000000000..c5e87d4ac3 --- /dev/null +++ b/docs/changelog-fragments.d/511.contrib.rst @@ -0,0 +1 @@ +703.contrib.rst \ No newline at end of file diff --git a/docs/changelog-fragments.d/680.contrib.rst b/docs/changelog-fragments.d/680.contrib.rst new file mode 120000 index 0000000000..c5e87d4ac3 --- /dev/null +++ b/docs/changelog-fragments.d/680.contrib.rst @@ -0,0 +1 @@ +703.contrib.rst \ No newline at end of file diff --git a/docs/changelog-fragments.d/681.contrib.rst b/docs/changelog-fragments.d/681.contrib.rst new file mode 120000 index 0000000000..c5e87d4ac3 --- /dev/null +++ b/docs/changelog-fragments.d/681.contrib.rst @@ -0,0 +1 @@ +703.contrib.rst \ No newline at end of file diff --git a/docs/changelog-fragments.d/703.contrib.rst b/docs/changelog-fragments.d/703.contrib.rst new file mode 100644 index 0000000000..16eb8b0d68 --- /dev/null +++ b/docs/changelog-fragments.d/703.contrib.rst @@ -0,0 +1,15 @@ +The test infrastructure has been updated to stop using +the ``pytest-forked`` plugin +-- by :user:`jaraco` and :user:`webknjaz`. + +This plugin was causing problems with upgrading to modern +versions of Pytest and it is not going to be fixed anytime +soon. + +It was used in a test that interacts with the system +resource limits under \*NIX environments in hopes to isolate +the side effects caused by the preparatory code. + +It is possible that this will have an effect on the test +sessions and we may have to look for alternative solutions +for test process isolation.