From 6c5f7eabfff358fb574e19bc5c554553034d0fa8 Mon Sep 17 00:00:00 2001
From: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Date: Tue, 10 Jun 2025 15:26:07 +0200
Subject: [PATCH] Fix RuntimeWarning in rest tests (#146452)

---
 tests/components/rest/test_sensor.py |  5 +++--
 tests/test_util/aiohttp.py           | 29 ++++++++++++++--------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/tests/components/rest/test_sensor.py b/tests/components/rest/test_sensor.py
index 36b0d803f54..c688ff1b314 100644
--- a/tests/components/rest/test_sensor.py
+++ b/tests/components/rest/test_sensor.py
@@ -2,7 +2,7 @@
 
 from http import HTTPStatus
 import ssl
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import patch
 
 import pytest
 
@@ -174,11 +174,12 @@ async def test_setup_ssl_ciphers(
     hass: HomeAssistant,
     ssl_cipher_list: str,
     ssl_cipher_list_expected: SSLCipherList,
+    aioclient_mock: AiohttpClientMocker,
 ) -> None:
     """Test setup with minimum configuration."""
     with patch(
         "homeassistant.components.rest.data.async_get_clientsession",
-        return_value=MagicMock(request=AsyncMock(return_value=MagicMock())),
+        return_value=aioclient_mock,
     ) as aiohttp_client:
         assert await async_setup_component(
             hass,
diff --git a/tests/test_util/aiohttp.py b/tests/test_util/aiohttp.py
index 9207ba0904b..eea3f4e88b4 100644
--- a/tests/test_util/aiohttp.py
+++ b/tests/test_util/aiohttp.py
@@ -63,6 +63,7 @@ class AiohttpClientMocker:
         cookies=None,
         side_effect=None,
         closing=None,
+        timeout=None,
     ):
         """Mock a request."""
         if not isinstance(url, RETYPE):
@@ -70,21 +71,21 @@ class AiohttpClientMocker:
         if params:
             url = url.with_query(params)
 
-        self._mocks.append(
-            AiohttpClientMockResponse(
-                method=method,
-                url=url,
-                status=status,
-                response=content,
-                json=json,
-                text=text,
-                cookies=cookies,
-                exc=exc,
-                headers=headers,
-                side_effect=side_effect,
-                closing=closing,
-            )
+        resp = AiohttpClientMockResponse(
+            method=method,
+            url=url,
+            status=status,
+            response=content,
+            json=json,
+            text=text,
+            cookies=cookies,
+            exc=exc,
+            headers=headers,
+            side_effect=side_effect,
+            closing=closing,
         )
+        self._mocks.append(resp)
+        return resp
 
     def get(self, *args, **kwargs):
         """Register a mock get request."""