[tests] Use require_service and assert_device_name in the online_image and backpressure tests (#21240)

tests/integration/test_api_list_entities_backpressure.py

@@ -19,6 +19,7 @@ from aioesphomeapi import api_pb2
 import pytest
 
 from .raw_api_client import MESSAGE_TYPE_OF, RawApiClient
+from .state_utils import assert_device_name
 from .types import APIClientConnectedFactory, RunCompiledFunction
 
 SERVICES_RESPONSE = MESSAGE_TYPE_OF[api_pb2.ListEntitiesServicesResponse]
@@ -92,8 +93,9 @@ async def test_api_list_entities_backpressure(
 
             # Other clients must still be served while the first is blocked
             async with api_client_connected(timeout=20) as client:
-                device_info = await asyncio.wait_for(client.device_info(), 20)
-                assert device_info.name == "api-backpressure-test"
+                await asyncio.wait_for(
+                    assert_device_name(client, "api-backpressure-test"), 20
+                )
                 _, services = await asyncio.wait_for(
                     client.list_entities_services(), 30
                 )

tests/integration/test_online_image_auto_detects_image_bmp_mime.py

@@ -12,6 +12,7 @@ from .online_image_utils import (
     make_download_watcher,
     wait_for_download,
 )
+from .state_utils import assert_device_name, require_service
 from .types import APIClientConnectedFactory, RunCompiledFunction
 
 
@@ -50,13 +51,10 @@ async def test_online_image_auto_detects_image_bmp_mime(
         run_compiled(config, line_callback=check_output),
         api_client_connected() as client,
     ):
-        device_info = await client.device_info()
-        assert device_info is not None
-        assert device_info.name == "online-image-bmp"
+        await assert_device_name(client, "online-image-bmp")
 
         _, services = await client.list_entities_services()
-        request_service = next((s for s in services if s.name == "fetch_image"), None)
-        assert request_service is not None
+        request_service = require_service(services, "fetch_image")
 
         await client.execute_service(request_service, {})
 

tests/integration/test_online_image_auto_detects_redirected_image_bmp_mime.py

@@ -12,6 +12,7 @@ from .online_image_utils import (
     make_download_watcher,
     wait_for_download,
 )
+from .state_utils import assert_device_name, require_service
 from .types import APIClientConnectedFactory, RunCompiledFunction
 
 
@@ -50,13 +51,10 @@ async def test_online_image_auto_detects_redirected_image_bmp_mime(
         run_compiled(config, line_callback=check_output),
         api_client_connected() as client,
     ):
-        device_info = await client.device_info()
-        assert device_info is not None
-        assert device_info.name == "online-image-bmp"
+        await assert_device_name(client, "online-image-bmp")
 
         _, services = await client.list_entities_services()
-        request_service = next((s for s in services if s.name == "fetch_image"), None)
-        assert request_service is not None
+        request_service = require_service(services, "fetch_image")
 
         await client.execute_service(request_service, {})
 

tests/integration/test_online_image_bmp.py

@@ -5,6 +5,7 @@ import asyncio
 import pytest
 
 from .online_image_utils import LEN_BMP_IMAGE, handle_http, make_download_watcher
+from .state_utils import assert_device_name, require_service
 from .types import APIClientConnectedFactory, RunCompiledFunction
 
 
@@ -41,17 +42,13 @@ async def test_online_image_bmp(
     ):
         # Verify device info
 
-        device_info = await client.device_info()
-        assert device_info is not None
-        assert device_info.name == "online-image-bmp"
+        await assert_device_name(client, "online-image-bmp")
 
         # List services to find our test service
         _, services = await client.list_entities_services()
 
         # Find test service
-        request_service = next((s for s in services if s.name == "fetch_image"), None)
-
-        assert request_service is not None, "fetch_image service not found"
+        request_service = require_service(services, "fetch_image")
 
         await client.execute_service(request_service, {})