Reraise OSError as ClientConnectionError when failing to explictly close connector socket

This is a followup to #10464 to handle the case where
socket.close() can also raise. This matches the logic
we have in aiohappyeyeballs:

https://github.com/aio-libs/aiohappyeyeballs/blob/e3bd5bdf44f5d187802de6dcb08d27e1ca6da048/src/aiohappyeyeballs/impl.py#L227

fixes #10506

Author: bdraco

aiohttp/connector.py

@@ -1143,7 +1143,10 @@ async def _wrap_create_connection(
                 # Will be hit if an exception is thrown before the event loop takes the socket.
                 # In that case, proactively close the socket to guard against event loop leaks.
                 # For example, see https://github.com/MagicStack/uvloop/issues/653.
-                sock.close()
+                try:
+                    sock.close()
+                except OSError as exc:
+                    raise client_error(req.connection_key, exc) from exc
 
     def _warn_about_tls_in_tls(
         self,

tests/test_connector.py

@@ -669,6 +669,33 @@ async def test_tcp_connector_closes_socket_on_error(
     await conn.close()
 
 
+async def test_tcp_connector_closes_socket_on_error_results_in_another_error(
+    loop: asyncio.AbstractEventLoop, start_connection: mock.AsyncMock
+) -> None:
+    """Test that when error occurs while closing the socket."""
+    req = ClientRequest("GET", URL("https://127.0.0.1:443"), loop=loop)
+    start_connection.return_value.close.side_effect = OSError(
+        1, "error from closing socket"
+    )
+
+    conn = aiohttp.TCPConnector()
+    with (
+        mock.patch.object(
+            conn._loop,
+            "create_connection",
+            autospec=True,
+            spec_set=True,
+            side_effect=ValueError,
+        ),
+        pytest.raises(aiohttp.ClientConnectionError, match="error from closing socket"),
+    ):
+        await conn.connect(req, [], ClientTimeout())
+
+    assert start_connection.return_value.close.called
+
+    await conn.close()
+
+
 async def test_tcp_connector_server_hostname_default(
     loop: asyncio.AbstractEventLoop, start_connection: mock.AsyncMock
 ) -> None: