Fix failing UniFi tests related to utcnow (#119131)

* test

* Fix missed test

tests/components/unifi/test_device_tracker.py

@@ -704,10 +704,19 @@ async def test_option_track_devices(
     assert hass.states.get("device_tracker.device")
 
 
-@pytest.mark.parametrize(
-    "client_payload",
-    [
-        [
+@pytest.mark.usefixtures("mock_device_registry")
+async def test_option_ssid_filter(
+    hass: HomeAssistant,
+    mock_unifi_websocket,
+    config_entry_factory: Callable[[], ConfigEntry],
+    client_payload: list[dict[str, Any]],
+) -> None:
+    """Test the SSID filter works.
+
+    Client will travel from a supported SSID to an unsupported ssid.
+    Client on SSID2 will be removed on change of options.
+    """
+    client_payload += [
         {
             "essid": "ssid",
             "hostname": "client",
@@ -723,27 +732,15 @@ async def test_option_track_devices(
             "mac": "00:00:00:00:00:02",
         },
     ]
-    ],
-)
-@pytest.mark.usefixtures("mock_device_registry")
-async def test_option_ssid_filter(
-    hass: HomeAssistant,
-    mock_unifi_websocket,
-    config_entry_setup: ConfigEntry,
-    client_payload: list[dict[str, Any]],
-) -> None:
-    """Test the SSID filter works.
+    config_entry = await config_entry_factory()
 
-    Client will travel from a supported SSID to an unsupported ssid.
-    Client on SSID2 will be removed on change of options.
-    """
     assert len(hass.states.async_entity_ids(TRACKER_DOMAIN)) == 2
     assert hass.states.get("device_tracker.client").state == STATE_HOME
     assert hass.states.get("device_tracker.client_on_ssid2").state == STATE_NOT_HOME
 
     # Setting SSID filter will remove clients outside of filter
     hass.config_entries.async_update_entry(
-        config_entry_setup, options={CONF_SSID_FILTER: ["ssid"]}
+        config_entry, options={CONF_SSID_FILTER: ["ssid"]}
     )
     await hass.async_block_till_done()
 
@@ -766,8 +763,7 @@ async def test_option_ssid_filter(
 
     new_time = dt_util.utcnow() + timedelta(
         seconds=(
-            config_entry_setup.options.get(CONF_DETECTION_TIME, DEFAULT_DETECTION_TIME)
-            + 1
+            config_entry.options.get(CONF_DETECTION_TIME, DEFAULT_DETECTION_TIME) + 1
         )
     )
     with freeze_time(new_time):
@@ -781,9 +777,7 @@ async def test_option_ssid_filter(
     assert not hass.states.get("device_tracker.client_on_ssid2")
 
     # Remove SSID filter
-    hass.config_entries.async_update_entry(
-        config_entry_setup, options={CONF_SSID_FILTER: []}
-    )
+    hass.config_entries.async_update_entry(config_entry, options={CONF_SSID_FILTER: []})
     await hass.async_block_till_done()
 
     client["last_seen"] += 1
@@ -797,8 +791,7 @@ async def test_option_ssid_filter(
     # Time pass to mark client as away
     new_time += timedelta(
         seconds=(
-            config_entry_setup.options.get(CONF_DETECTION_TIME, DEFAULT_DETECTION_TIME)
-            + 1
+            config_entry.options.get(CONF_DETECTION_TIME, DEFAULT_DETECTION_TIME) + 1
         )
     )
     with freeze_time(new_time):
@@ -820,9 +813,7 @@ async def test_option_ssid_filter(
     await hass.async_block_till_done()
 
     new_time += timedelta(
-        seconds=(
-            config_entry_setup.options.get(CONF_DETECTION_TIME, DEFAULT_DETECTION_TIME)
-        )
+        seconds=(config_entry.options.get(CONF_DETECTION_TIME, DEFAULT_DETECTION_TIME))
     )
     with freeze_time(new_time):
         async_fire_time_changed(hass, new_time)
@@ -831,10 +822,18 @@ async def test_option_ssid_filter(
     assert hass.states.get("device_tracker.client_on_ssid2").state == STATE_NOT_HOME
 
 
-@pytest.mark.parametrize(
-    "client_payload",
-    [
-        [
+@pytest.mark.usefixtures("mock_device_registry")
+async def test_wireless_client_go_wired_issue(
+    hass: HomeAssistant,
+    mock_unifi_websocket,
+    config_entry_factory: Callable[[], ConfigEntry],
+    client_payload: list[dict[str, Any]],
+) -> None:
+    """Test the solution to catch wireless device go wired UniFi issue.
+
+    UniFi Network has a known issue that when a wireless device goes away it sometimes gets marked as wired.
+    """
+    client_payload.append(
         {
             "essid": "ssid",
             "hostname": "client",
@@ -843,20 +842,9 @@ async def test_option_ssid_filter(
             "last_seen": dt_util.as_timestamp(dt_util.utcnow()),
             "mac": "00:00:00:00:00:01",
         }
-        ]
-    ],
-)
-@pytest.mark.usefixtures("mock_device_registry")
-async def test_wireless_client_go_wired_issue(
-    hass: HomeAssistant,
-    mock_unifi_websocket,
-    config_entry_setup: ConfigEntry,
-    client_payload: list[dict[str, Any]],
-) -> None:
-    """Test the solution to catch wireless device go wired UniFi issue.
+    )
+    config_entry = await config_entry_factory()
 
-    UniFi Network has a known issue that when a wireless device goes away it sometimes gets marked as wired.
-    """
     assert len(hass.states.async_entity_ids(TRACKER_DOMAIN)) == 1
 
     # Client is wireless
@@ -876,9 +864,7 @@ async def test_wireless_client_go_wired_issue(
 
     # Pass time
     new_time = dt_util.utcnow() + timedelta(
-        seconds=(
-            config_entry_setup.options.get(CONF_DETECTION_TIME, DEFAULT_DETECTION_TIME)
-        )
+        seconds=(config_entry.options.get(CONF_DETECTION_TIME, DEFAULT_DETECTION_TIME))
     )
     with freeze_time(new_time):
         async_fire_time_changed(hass, new_time)
@@ -909,10 +895,15 @@ async def test_wireless_client_go_wired_issue(
 
 
 @pytest.mark.parametrize("config_entry_options", [{CONF_IGNORE_WIRED_BUG: True}])
-@pytest.mark.parametrize(
-    "client_payload",
-    [
-        [
+@pytest.mark.usefixtures("mock_device_registry")
+async def test_option_ignore_wired_bug(
+    hass: HomeAssistant,
+    mock_unifi_websocket,
+    config_entry_factory: Callable[[], ConfigEntry],
+    client_payload: list[dict[str, Any]],
+) -> None:
+    """Test option to ignore wired bug."""
+    client_payload.append(
         {
             "ap_mac": "00:00:00:00:02:01",
             "essid": "ssid",
@@ -922,17 +913,9 @@ async def test_wireless_client_go_wired_issue(
             "last_seen": dt_util.as_timestamp(dt_util.utcnow()),
             "mac": "00:00:00:00:00:01",
         }
-        ]
-    ],
-)
-@pytest.mark.usefixtures("mock_device_registry")
-async def test_option_ignore_wired_bug(
-    hass: HomeAssistant,
-    mock_unifi_websocket,
-    config_entry_setup: ConfigEntry,
-    client_payload: list[dict[str, Any]],
-) -> None:
-    """Test option to ignore wired bug."""
+    )
+    config_entry = await config_entry_factory()
+
     assert len(hass.states.async_entity_ids(TRACKER_DOMAIN)) == 1
 
     # Client is wireless
@@ -951,9 +934,7 @@ async def test_option_ignore_wired_bug(
 
     # pass time
     new_time = dt_util.utcnow() + timedelta(
-        seconds=config_entry_setup.options.get(
-            CONF_DETECTION_TIME, DEFAULT_DETECTION_TIME
-        )
+        seconds=config_entry.options.get(CONF_DETECTION_TIME, DEFAULT_DETECTION_TIME)
     )
     with freeze_time(new_time):
         async_fire_time_changed(hass, new_time)

tests/components/unifi/test_hub.py

@@ -4,6 +4,7 @@ from collections.abc import Callable
 from copy import deepcopy
 from datetime import timedelta
 from http import HTTPStatus
+from typing import Any
 from unittest.mock import patch
 
 import aiounifi
@@ -313,27 +314,25 @@ async def test_reset_fails(
         assert config_entry.state is ConfigEntryState.LOADED
 
 
-@pytest.mark.parametrize(
-    "client_payload",
-    [
-        [
+async def test_connection_state_signalling(
+    hass: HomeAssistant,
+    mock_device_registry,
+    websocket_mock,
+    config_entry_factory: Callable[[], ConfigEntry],
+    client_payload: list[dict[str, Any]],
+) -> None:
+    """Verify connection statesignalling and connection state are working."""
+    client_payload.append(
         {
             "hostname": "client",
             "ip": "10.0.0.1",
             "is_wired": True,
             "last_seen": dt_util.as_timestamp(dt_util.utcnow()),
             "mac": "00:00:00:00:00:01",
-            },
-        ]
-    ],
-)
-async def test_connection_state_signalling(
-    hass: HomeAssistant,
-    mock_device_registry,
-    config_entry_setup: ConfigEntry,
-    websocket_mock,
-) -> None:
-    """Verify connection statesignalling and connection state are working."""
+        }
+    )
+    await config_entry_factory()
+
     # Controller is connected
     assert hass.states.get("device_tracker.client").state == "home"
 

tests/components/unifi/test_sensor.py

@@ -682,10 +682,17 @@ async def test_poe_port_switches(
     assert hass.states.get("sensor.mock_name_port_1_poe_power")
 
 
-@pytest.mark.parametrize(
-    "client_payload",
-    [
-        [
+@pytest.mark.parametrize("wlan_payload", [[WLAN]])
+async def test_wlan_client_sensors(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    mock_unifi_websocket,
+    websocket_mock,
+    config_entry_factory: Callable[[], ConfigEntry],
+    client_payload: list[dict[str, Any]],
+) -> None:
+    """Verify that WLAN client sensors are working as expected."""
+    client_payload += [
         {
             "essid": "SSID 1",
             "is_wired": False,
@@ -707,18 +714,8 @@ async def test_poe_port_switches(
             "tx_bytes-r": 6789000000,
         },
     ]
-    ],
-)
-@pytest.mark.parametrize("wlan_payload", [[WLAN]])
-@pytest.mark.usefixtures("config_entry_setup")
-async def test_wlan_client_sensors(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    mock_unifi_websocket,
-    websocket_mock,
-    client_payload: list[dict[str, Any]],
-) -> None:
-    """Verify that WLAN client sensors are working as expected."""
+    await config_entry_factory()
+
     assert len(hass.states.async_entity_ids(SENSOR_DOMAIN)) == 1
 
     ent_reg_entry = entity_registry.async_get("sensor.ssid_1")