Various minor tweaks in samsungtv tests (#143951)

tests/components/samsungtv/__init__.py

@@ -2,12 +2,13 @@
 
 from __future__ import annotations
 
+from collections.abc import Mapping
 from datetime import timedelta
+from typing import Any
 
 from homeassistant.components.samsungtv.const import DOMAIN, ENTRY_RELOAD_COOLDOWN
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed
@@ -22,7 +23,9 @@ async def async_wait_config_entry_reload(hass: HomeAssistant) -> None:
     await hass.async_block_till_done()
 
 
-async def setup_samsungtv_entry(hass: HomeAssistant, data: ConfigType) -> ConfigEntry:
+async def setup_samsungtv_entry(
+    hass: HomeAssistant, data: Mapping[str, Any]
+) -> ConfigEntry:
     """Set up mock Samsung TV from config entry data."""
     entry = MockConfigEntry(
         domain=DOMAIN,

tests/components/samsungtv/conftest.py

@@ -92,13 +92,13 @@ def upnp_factory_fixture() -> Generator[Mock]:
 
 
 @pytest.fixture(name="upnp_device")
-def upnp_device_fixture(upnp_factory: Mock) -> Generator[Mock]:
+def upnp_device_fixture(upnp_factory: Mock) -> Mock:
     """Patch async_upnp_client."""
     upnp_device = Mock(UpnpDevice)
     upnp_device.services = {}
 
-    with patch.object(upnp_factory, "async_create_device", side_effect=[upnp_device]):
-        yield upnp_device
+    upnp_factory.async_create_device.side_effect = [upnp_device]
+    return upnp_device
 
 
 @pytest.fixture(name="dmr_device")

tests/components/samsungtv/test_init.py

@@ -72,7 +72,7 @@ async def test_setup(hass: HomeAssistant) -> None:
         == SUPPORT_SAMSUNGTV | MediaPlayerEntityFeature.TURN_ON
     )
 
-    # test host and port
+    # Ensure service is registered
     await hass.services.async_call(
         MP_DOMAIN, SERVICE_VOLUME_UP, {ATTR_ENTITY_ID: ENTITY_ID}, True
     )