diff --git a/tests/components/samsungtv/snapshots/test_init.ambr b/tests/components/samsungtv/snapshots/test_init.ambr index 48201781004..443484e38c7 100644 --- a/tests/components/samsungtv/snapshots/test_init.ambr +++ b/tests/components/samsungtv/snapshots/test_init.ambr @@ -1,90 +1,4 @@ # serializer version: 1 -# name: test_cleanup_mac - list([ - DeviceRegistryEntrySnapshot({ - 'area_id': None, - 'config_entries': , - 'config_entries_subentries': , - 'configuration_url': None, - 'connections': set({ - tuple( - 'mac', - 'aa:bb:cc:dd:ee:ff', - ), - tuple( - 'mac', - 'none', - ), - }), - 'disabled_by': None, - 'entry_type': None, - 'hw_version': None, - 'id': , - 'identifiers': set({ - tuple( - 'samsungtv', - 'any', - ), - }), - 'is_new': False, - 'labels': set({ - }), - 'manufacturer': None, - 'model': '82GXARRS', - 'model_id': None, - 'name': 'fake', - 'name_by_user': None, - 'primary_config_entry': , - 'serial_number': None, - 'suggested_area': None, - 'sw_version': None, - 'via_device_id': None, - }), - ]) -# --- -# name: test_cleanup_mac.1 - list([ - DeviceRegistryEntrySnapshot({ - 'area_id': None, - 'config_entries': , - 'config_entries_subentries': , - 'configuration_url': None, - 'connections': set({ - tuple( - 'mac', - 'aa:bb:cc:dd:ee:ff', - ), - tuple( - 'mac', - 'none', - ), - }), - 'disabled_by': None, - 'entry_type': None, - 'hw_version': None, - 'id': , - 'identifiers': set({ - tuple( - 'samsungtv', - 'any', - ), - }), - 'is_new': False, - 'labels': set({ - }), - 'manufacturer': None, - 'model': '82GXARRS', - 'model_id': '82GXARRS', - 'name': 'fake', - 'name_by_user': None, - 'primary_config_entry': , - 'serial_number': None, - 'suggested_area': None, - 'sw_version': None, - 'via_device_id': None, - }), - ]) -# --- # name: test_setup_updates_from_ssdp StateSnapshot({ 'attributes': ReadOnlyDict({ diff --git a/tests/components/samsungtv/test_init.py b/tests/components/samsungtv/test_init.py index 7d191771ea0..0b72a112301 100644 --- a/tests/components/samsungtv/test_init.py +++ b/tests/components/samsungtv/test_init.py @@ -36,13 +36,12 @@ from homeassistant.const import ( SERVICE_VOLUME_UP, ) from homeassistant.core import HomeAssistant -from homeassistant.helpers import device_registry as dr, entity_registry as er +from homeassistant.helpers import entity_registry as er from . import setup_samsungtv_entry from .const import ( ENTRYDATA_ENCRYPTED_WEBSOCKET, ENTRYDATA_WEBSOCKET, - MOCK_ENTRY_WS_WITH_MAC, MOCK_SSDP_DATA_MAIN_TV_AGENT_ST, MOCK_SSDP_DATA_RENDERING_CONTROL_ST, ) @@ -234,54 +233,3 @@ async def test_incorrectly_formatted_mac_fixed(hass: HomeAssistant) -> None: config_entries = hass.config_entries.async_entries(DOMAIN) assert len(config_entries) == 1 assert config_entries[0].data[CONF_MAC] == "aa:bb:aa:aa:aa:aa" - - -@pytest.mark.usefixtures("remote_websocket", "rest_api") -@pytest.mark.xfail -async def test_cleanup_mac( - hass: HomeAssistant, device_registry: dr.DeviceRegistry, snapshot: SnapshotAssertion -) -> None: - """Test for `none` mac cleanup #103512. - - Reverted due to device registry collisions in #119249 / #119082 - """ - entry = MockConfigEntry( - domain=DOMAIN, - data=MOCK_ENTRY_WS_WITH_MAC, - entry_id="123456", - unique_id="be9554b9-c9fb-41f4-8920-22da015376a4", - version=2, - minor_version=1, - ) - entry.add_to_hass(hass) - - # Setup initial device registry, with incorrect MAC - device_registry.async_get_or_create( - config_entry_id="123456", - connections={ - (dr.CONNECTION_NETWORK_MAC, "none"), - (dr.CONNECTION_NETWORK_MAC, "aa:bb:cc:dd:ee:ff"), - }, - identifiers={("samsungtv", "be9554b9-c9fb-41f4-8920-22da015376a4")}, - model="82GXARRS", - name="fake", - ) - device_entries = dr.async_entries_for_config_entry(device_registry, entry.entry_id) - assert device_entries == snapshot - assert device_entries[0].connections == { - (dr.CONNECTION_NETWORK_MAC, "none"), - (dr.CONNECTION_NETWORK_MAC, "aa:bb:cc:dd:ee:ff"), - } - - # Run setup, and ensure the NONE mac is removed - await hass.config_entries.async_setup(entry.entry_id) - await hass.async_block_till_done() - - device_entries = dr.async_entries_for_config_entry(device_registry, entry.entry_id) - assert device_entries == snapshot - assert device_entries[0].connections == { - (dr.CONNECTION_NETWORK_MAC, "aa:bb:cc:dd:ee:ff") - } - - assert entry.version == 2 - assert entry.minor_version == 2