Merge branch 'copilot/fix-failing-github-actions-job' of github.com:mindflayer/python-mocket into copilot/fix-failing-github-actions-job

Author: mindflayer

mocket/socket.py

@@ -621,9 +621,13 @@ def recv(self, buffersize: int, flags: int | None = None) -> bytes:
         r_fd, _ = Mocket.get_pair(address)
         if r_fd and Mocket.pipe_uses_data(address):
             try:
-                return os.read(r_fd, buffersize)
+                pipe_data = os.read(r_fd, buffersize)
             except BlockingIOError:
-                pass
+                pipe_data = b""
+            if pipe_data:
+                # Keep in-memory buffer position in sync with bytes drained from the pipe.
+                self.io.seek(self.io.tell() + len(pipe_data))
+                return pipe_data
 
         pending = Mocket.get_pending_readables(address)
         if r_fd and self._buffered_bytes() and pending == 0:

mocket/ssl/socket.py

@@ -80,7 +80,7 @@ def getpeercert(self, binary_form: bool = False) -> _PeerCertRetDictType:
         Returns:
             Mock certificate dictionary
         """
-        if not (self._host and self._port):
+        if self._host is None or self._port is None:
             self._address = self._host, self._port = Mocket._address
 
         now = datetime.now()

tests/test_socket.py

@@ -149,6 +149,20 @@ def test_wrap_bio_uses_current_mocket_address(
     assert ssl_obj._address == (expected_host, 443)
 
 
+def test_wrap_bio_preserves_empty_server_hostname_on_getpeercert(monkeypatch):
+    monkeypatch.setattr(Mocket, "_address", ("httpbin.local", 443))
+    ssl_obj = MocketSSLContext().wrap_bio(
+        incoming=None,
+        outgoing=None,
+        server_hostname="",
+    )
+
+    ssl_obj.getpeercert()
+
+    assert ssl_obj._host == ""
+    assert ssl_obj._address == ("", 443)
+
+
 def test_recvfrom_into():
     sock = MocketSocket(socket.AF_INET, socket.SOCK_STREAM)
     test_data = b"abc123"