Skip to content

Commit 94a3734

Browse files
committed
Merge branch 'maintenance/unfork-pytest'
2 parents ead1269 + 32e09b4 commit 94a3734

File tree

7 files changed

+22
-15
lines changed

7 files changed

+22
-15
lines changed

cheroot/test/test_server.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -400,15 +400,6 @@ def test_reuse_port(http_server, ip_addr, mocker):
400400
assert spy.spy_exception is None
401401

402402

403-
ISSUE511 = IS_MACOS
404-
405-
406-
if not IS_WINDOWS and not ISSUE511:
407-
test_high_number_of_file_descriptors = pytest.mark.forked(
408-
test_high_number_of_file_descriptors,
409-
)
410-
411-
412403
@pytest.fixture
413404
def _garbage_bin():
414405
"""Disable garbage collection when this fixture is in use."""
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
703.contrib.rst
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
703.contrib.rst
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
703.contrib.rst
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
703.contrib.rst
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
The test infrastructure has been updated to stop using
2+
the ``pytest-forked`` plugin
3+
-- by :user:`jaraco` and :user:`webknjaz`.
4+
5+
This plugin was causing problems with upgrading to modern
6+
versions of Pytest and it is not going to be fixed anytime
7+
soon.
8+
9+
It was used in a test that interacts with the system
10+
resource limits under \*NIX environments in hopes to isolate
11+
the side effects caused by the preparatory code.
12+
13+
It is possible that this will have an effect on the test
14+
sessions and we may have to look for alternative solutions
15+
for test process isolation.

requirements/tests.in

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,15 @@ pypytools
3434

3535
pytest-clarity
3636
pytest-cov==2.12.0
37-
pytest-forked>=1.2.0; sys_platform != "win32"
3837
pytest-mock>=1.11.0
3938
pytest-rerunfailures
4039
pytest-sugar>=0.9.3
4140
pytest-watch==4.2.0
4241
pytest-xdist>=1.28.0
4342

44-
# pytest-forked is currently incompatible with pytest 7
45-
# Refs:
46-
# * https://github.com/cherrypy/cheroot/issues/511
47-
# * https://github.com/pytest-dev/pytest-forked/issues/67
48-
pytest >= 4.6.6, < 7
43+
# pytest 7.2 introduces deprecations triggered by pytest-cov
44+
# * https://github.com/cherrypy/cheroot/issues/682
45+
pytest >= 7, <7.2
4946

5047
# HTTP over UNIX socket
5148
requests-unixsocket

0 commit comments

Comments
 (0)