Merge branch 'fix-builtin-wrap' of https://github.com/julianz-/cheroot into fix-builtin-wrap

Author: julianz-

.github/workflows/ci-cd.yml

@@ -1061,6 +1061,9 @@ jobs:
     - build
     - post-release-repo-update
     - pre-setup  # transitive, for accessing settings
+    if: >-
+      always()
+      && needs.post-release-repo-update.result == 'success'
 
     permissions:
       actions: read

.pre-commit-config.yaml

@@ -287,6 +287,9 @@ repos:
     - pyOpenSSL  # needed by pylint-pytest since it picks up pytest's args
     - pypytools
     - pytest-cov  # needed by pylint-pytest since it picks up pytest's args
+    - pytest-mock  # needed by pylint-pytest since it picks up pytest's args
+    - >-  # needed by pylint-pytest since it picks up pytest's args
+      pytest-rerunfailures
     - pytest-xdist  # needed by pylint-pytest since it picks up pytest's args
     - requests_toolbelt
     - requests_unixsocket

cheroot/makefile.py

@@ -21,7 +21,7 @@
         _not_a_socket_err = 10038
 else:
     # On other platforms, the relevant error is EBADF (Bad file descriptor),
-    # which is already in your list of handled errors.
+    # which is already in the list of handled errors.
     pass
 
 # Expose the error constant for use in the module's public API if needed.

cheroot/test/test_conn.py

@@ -2,6 +2,7 @@
 
 import errno
 import http.client
+import io
 import logging
 import socket
 import time
@@ -14,6 +15,7 @@
 import pytest
 
 from jaraco.text import trim, unwrap
+from OpenSSL.SSL import SysCallError
 
 import cheroot.server
 from cheroot._compat import IS_CI, IS_MACOS, IS_PYPY, IS_WINDOWS
@@ -1645,8 +1647,6 @@ class TestBufferedWriter:
 
     def test_close_is_idempotent(self):
         """Test that close() can be called multiple times safely."""
-        import io
-
         raw_buffer = io.BytesIO()
         buffered_writer = BufferedWriter(raw_buffer)
 
@@ -1658,8 +1658,6 @@ def test_close_is_idempotent(self):
 
     def test_close_handles_already_closed_buffer(self):
         """Test that close() handles already closed underlying buffer."""
-        import io
-
         raw_buffer = io.BytesIO()
         buffered_writer = BufferedWriter(raw_buffer)
 
@@ -1668,3 +1666,46 @@ def test_close_handles_already_closed_buffer(self):
 
         # This should not raise an exception
         buffered_writer.close()
+
+    def test_close_handles_os_error_ebadf(self, mocker):
+        """Test that close() handles OSError with EBADF errno gracefully."""
+        raw_buffer = io.BytesIO()
+        buffered_writer = BufferedWriter(raw_buffer)
+
+        # Mock super().close() to raise OSError with EBADF
+        mock_super = mocker.patch('cheroot.makefile.super')
+        mock_super.return_value.close.side_effect = OSError(
+            errno.EBADF,
+            'Bad file descriptor',
+        )
+
+        # Should handle EBADF gracefully (no exception raised)
+        buffered_writer.close()
+
+    def test_close_handles_os_error_enotconn(self, mocker):
+        """Test that close() handles OSError with ENOTCONN errno gracefully."""
+        raw_buffer = io.BytesIO()
+        buffered_writer = BufferedWriter(raw_buffer)
+
+        # Mock super().close() to raise OSError with ENOTCONN
+        mock_super = mocker.patch('cheroot.makefile.super')
+        mock_super.return_value.close.side_effect = OSError(
+            errno.ENOTCONN,
+            'Socket is not connected',
+        )
+
+        # Should handle ENOTCONN gracefully (no exception raised)
+        buffered_writer.close()
+
+    def test_close_handles_syscall_error(self, mocker):
+        """Test that close() handles SysCallError with expected errno codes."""
+        raw_buffer = io.BytesIO()
+        buffered_writer = BufferedWriter(raw_buffer)
+
+        mock_super = mocker.patch('cheroot.makefile.super')
+        mock_super.return_value.close.side_effect = SysCallError(
+            errno.EBADF,
+        )  # args[0] will be errno.EBADF
+
+        # Should handle gracefully
+        buffered_writer.close()

requirements/tox-py310-cp310-darwin-arm64.txt

@@ -18,7 +18,7 @@ charset-normalizer==3.4.3
     # via requests
 colorama==0.4.6
     # via pytest-watch
-coverage==7.10.6
+coverage==7.10.7
     # via
     #   -r requirements/tox-py310-cp310-darwin-arm64.in
     #   pytest-cov

requirements/tox-py310-cp310-darwin-x86_64.txt

@@ -18,7 +18,7 @@ charset-normalizer==3.4.3
     # via requests
 colorama==0.4.6
     # via pytest-watch
-coverage==7.10.6
+coverage==7.10.7
     # via
     #   -r requirements/tox-py310-cp310-darwin-x86_64.in
     #   pytest-cov

requirements/tox-py310-cp310-linux-aarch64.txt

@@ -18,7 +18,7 @@ charset-normalizer==3.4.3
     # via requests
 colorama==0.4.6
     # via pytest-watch
-coverage==7.10.6
+coverage==7.10.7
     # via
     #   -r requirements/tox-py310-cp310-linux-aarch64.in
     #   pytest-cov

requirements/tox-py310-cp310-linux-x86_64.txt

@@ -18,7 +18,7 @@ charset-normalizer==3.4.3
     # via requests
 colorama==0.4.6
     # via pytest-watch
-coverage==7.10.6
+coverage==7.10.7
     # via
     #   -r requirements/tox-py310-cp310-linux-x86_64.in
     #   pytest-cov

requirements/tox-py310-cp310-win32-amd64.txt

@@ -20,7 +20,7 @@ colorama==0.4.6
     # via
     #   pytest
     #   pytest-watch
-coverage==7.10.6
+coverage==7.10.7
     # via
     #   -r requirements/tox-py310-cp310-win32-amd64.in
     #   pytest-cov

requirements/tox-py311-cp311-darwin-arm64.txt

@@ -18,7 +18,7 @@ charset-normalizer==3.4.3
     # via requests
 colorama==0.4.6
     # via pytest-watch
-coverage==7.10.6
+coverage==7.10.7
     # via
     #   -r requirements/tox-py311-cp311-darwin-arm64.in
     #   pytest-cov