mitigate lingering timers

Author: patman15

tests/conftest.py

@@ -3,7 +3,6 @@
 from collections.abc import Awaitable, Buffer, Callable, Iterable
 import logging
 from typing import Any, Final
-from unittest.mock import MagicMock
 from uuid import UUID
 
 from aiobmsble import BMSInfo, BMSSample, MatcherPattern
@@ -43,16 +42,6 @@ def auto_enable_custom_integrations(enable_custom_integrations: None) -> None:
     return
 
 
-@pytest.fixture(autouse=True)
-def fix_HaScanner_patch(monkeypatch: pytest.MonkeyPatch) -> None:
-    """Patch HaScanner to avoid BT discovery.
-
-    fixes https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/pull/255
-    TODO: remove when pytest-homeassistant-custom-component is updated or fixed upstream
-    """
-    monkeypatch.setattr("homeassistant.components.bluetooth.HaScanner", MagicMock())
-
-
 @pytest.fixture(params=[False, True])
 def bool_fixture(request: pytest.FixtureRequest) -> bool:
     """Return False, True for tests."""

tests/test_binary_sensor.py

@@ -22,10 +22,10 @@
 
 SEN_PREFIX: Final[str] = "binary_sensor.config_test_dummy_bms"
 
-
 @pytest.mark.usefixtures(
     "enable_bluetooth", "patch_default_bleak_client", "patch_entity_enabled_default"
 )  # enable bluetooth, patch bleak client and enable all sensors
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_update(
     monkeypatch: pytest.MonkeyPatch,
     bt_discovery: BluetoothServiceInfoBleak,

tests/test_config_flow.py

@@ -70,6 +70,7 @@ def bms_adv(request: pytest.FixtureRequest) -> BluetoothServiceInfoBleak:
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_bluetooth_discovery(
     monkeypatch: pytest.MonkeyPatch,
     hass: HomeAssistant,
@@ -136,6 +137,7 @@ async def test_bluetooth_discovery(
     ids=["minimal", "full"],
 )
 @pytest.mark.usefixtures("enable_bluetooth", "patch_default_bleak_client")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_device_setup(
     monkeypatch: pytest.MonkeyPatch,
     bt_discovery: BluetoothServiceInfoBleak,
@@ -190,6 +192,7 @@ async def test_device_setup(
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_device_not_supported(
     bt_discovery_notsupported: BluetoothServiceInfoBleak, hass: HomeAssistant
 ) -> None:
@@ -206,6 +209,7 @@ async def test_device_not_supported(
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_user_already_configured(hass: HomeAssistant) -> None:
     """Test that same device cannot be added twice."""
 
@@ -228,6 +232,7 @@ async def test_user_already_configured(hass: HomeAssistant) -> None:
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_bluetooth_already_configured(
     hass: HomeAssistant, bt_discovery: BluetoothServiceInfoBleak
 ) -> None:
@@ -249,6 +254,7 @@ async def test_bluetooth_already_configured(
 
 
 @pytest.mark.usefixtures("enable_bluetooth", "patch_default_bleak_client")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_bluetooth_confirm_entry_added_during_flow(
     monkeypatch: pytest.MonkeyPatch,
     bt_discovery: BluetoothServiceInfoBleak,
@@ -286,6 +292,7 @@ async def test_bluetooth_confirm_entry_added_during_flow(
 
 
 @pytest.mark.usefixtures("enable_bluetooth", "patch_default_bleak_client")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_async_setup_entry(
     monkeypatch: pytest.MonkeyPatch,
     bms_fixture: str,
@@ -311,6 +318,7 @@ async def test_async_setup_entry(
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_setup_entry_missing_unique_id(
     bms_fixture: str, hass: HomeAssistant
 ) -> None:
@@ -328,6 +336,7 @@ async def test_setup_entry_missing_unique_id(
 @pytest.mark.usefixtures(
     "enable_bluetooth", "patch_default_bleak_client", "patch_entity_enabled_default"
 )
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_user_setup(
     monkeypatch: pytest.MonkeyPatch,
     bt_discovery: BluetoothServiceInfoBleak,
@@ -385,6 +394,7 @@ async def test_user_setup(
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_user_setup_invalid(
     bt_discovery_notsupported: BluetoothServiceInfoBleak, hass: HomeAssistant
 ) -> None:
@@ -398,6 +408,7 @@ async def test_user_setup_invalid(
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_user_setup_double_configure(
     monkeypatch: pytest.MonkeyPatch,
     bt_discovery: BluetoothServiceInfoBleak,
@@ -422,6 +433,7 @@ def patch_async_current_ids(_self, include_ignore: bool = True) -> set[str | Non
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_options_flow(
     monkeypatch: pytest.MonkeyPatch, hass: HomeAssistant
 ) -> None:
@@ -461,6 +473,7 @@ async def test_options_flow(
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_options_flow_no_secret(hass: HomeAssistant) -> None:
     """Test if options flow for BMS without secret."""
 
@@ -487,6 +500,7 @@ async def test_options_flow_no_secret(hass: HomeAssistant) -> None:
 
 @pytest.mark.usefixtures("enable_bluetooth", "patch_default_bleak_client")
 @pytest.mark.parametrize("keep_alive", [True, False])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_options_effect(
     monkeypatch: pytest.MonkeyPatch,
     hass: HomeAssistant,
@@ -551,6 +565,7 @@ def mock_bms_init(
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_invalid_options_flow(hass: HomeAssistant) -> None:
     """Test config options flow for unsupported BMS type."""
 
@@ -569,6 +584,7 @@ async def test_invalid_options_flow(hass: HomeAssistant) -> None:
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_no_migration(bms_fixture: str, hass: HomeAssistant) -> None:
     """Test that entries of correct version are kept."""
 
@@ -586,6 +602,7 @@ async def test_no_migration(bms_fixture: str, hass: HomeAssistant) -> None:
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_migrate_entry_future_version(hass: HomeAssistant) -> None:
     """Test migrating entries from future version."""
 
@@ -601,6 +618,7 @@ async def test_migrate_entry_future_version(hass: HomeAssistant) -> None:
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_migrate_invalid_v_0_1(bms_fixture: str, hass: HomeAssistant) -> None:
     """Test migrating an invalid entry in version 0.1."""
 
@@ -616,6 +634,7 @@ async def test_migrate_invalid_v_0_1(bms_fixture: str, hass: HomeAssistant) -> N
 
 
 @pytest.mark.usefixtures("enable_bluetooth", "patch_default_bleak_client")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_migrate_entry_from_v0_1(
     monkeypatch: pytest.MonkeyPatch,
     mock_config_v0_1: MockConfigEntry,
@@ -643,6 +662,7 @@ async def test_migrate_entry_from_v0_1(
 
 
 @pytest.mark.usefixtures("enable_bluetooth", "patch_default_bleak_client")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_migrate_entry_from_v1_0(
     monkeypatch: pytest.MonkeyPatch,
     bt_discovery: BluetoothServiceInfoBleak,
@@ -671,6 +691,7 @@ async def test_migrate_entry_from_v1_0(
 
 @pytest.mark.usefixtures("enable_bluetooth", "patch_default_bleak_client")
 @pytest.mark.parametrize("bms_fixture", ["dummy_bms", "ective_bms"])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_migrate_entry_from_v2_0(
     monkeypatch: pytest.MonkeyPatch,
     bt_discovery: BluetoothServiceInfoBleak,
@@ -701,6 +722,7 @@ async def test_migrate_entry_from_v2_0(
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 @pytest.mark.parametrize(
     ("unique_id_old", "unique_id_new"),
     [

tests/test_coordinator.py

@@ -27,6 +27,7 @@
 
 
 @pytest.mark.usefixtures("enable_bluetooth", "patch_default_bleak_client")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_update(
     monkeypatch: pytest.MonkeyPatch,
     bool_fixture: bool,
@@ -84,6 +85,7 @@ def mock_last_service_info(hass: HomeAssistant, address, connectable) -> None:
 
 
 @pytest.mark.usefixtures("enable_bluetooth", "patch_default_bleak_client")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_nodata(
     bt_discovery: BluetoothServiceInfoBleak, hass: HomeAssistant
 ) -> None:
@@ -110,6 +112,7 @@ async def test_nodata(
 @pytest.mark.parametrize(
     "mock_coordinator_exception", [TimeoutError, BleakError, EOFError]
 )
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_update_exception(
     bt_discovery: BluetoothServiceInfoBleak,
     mock_coordinator_exception: Exception,
@@ -130,6 +133,7 @@ async def test_update_exception(
 
 
 @pytest.mark.usefixtures("enable_bluetooth", "patch_default_bleak_client")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_stale_recovery(
     monkeypatch: pytest.MonkeyPatch,
     bt_discovery: BluetoothServiceInfoBleak,

tests/test_diagnostics.py

@@ -43,6 +43,7 @@
 
 
 @pytest.mark.usefixtures("enable_bluetooth")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_diagnostics(
     monkeypatch: pytest.MonkeyPatch,
     bool_fixture: bool,

tests/test_init.py

@@ -15,6 +15,7 @@
 
 @pytest.mark.usefixtures("enable_bluetooth", "patch_default_bleak_client")
 @pytest.mark.parametrize("swap", [False, True], ids=["devinfo", "update"])
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_init_fail(
     monkeypatch: pytest.MonkeyPatch,
     swap: bool,
@@ -65,6 +66,7 @@ async def mock_coord_shutdown(_self) -> None:
 
 
 @pytest.mark.usefixtures("enable_bluetooth", "patch_default_bleak_client")
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_unload_entry(
     monkeypatch: pytest.MonkeyPatch,
     bool_fixture: bool,

tests/test_sensor.py

@@ -40,6 +40,7 @@
 @pytest.mark.usefixtures(
     "enable_bluetooth", "patch_default_bleak_client", "patch_entity_enabled_default"
 )  # enable bluetooth, patch bleak client and enable all sensors
+@pytest.mark.parametrize("expected_lingering_timers", [True])
 async def test_update(
     monkeypatch: pytest.MonkeyPatch,
     bt_discovery: BluetoothServiceInfoBleak,