fix flaky tests

Author: patman15

tests/test_diagnostics.py

@@ -15,17 +15,18 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.discovery_flow import DiscoveryKey
 from tests.bluetooth import inject_bluetooth_service_info_bleak
 from tests.conftest import MockBleakClient, MockBMS, mock_config
 
 BT_ADAPTER: Final[dict[str, Any]] = {
     "connections": {(BT_DOMAIN, "local")},
-    "hw_version": 14,
+    "hw_version": "14",
     "manufacturer": "adapter mnf",
     "model": "adapter model",
-    "model_id": 2,
+    "model_id": "2",
     "name": "mock adapter",
-    "sw_version": 3,
+    "sw_version": "3",
 }
 
 BMS_DEV: Final[dict[str, Any]] = {
@@ -81,7 +82,15 @@ async def test_diagnostics(
                 "type": "aiobmsble.bms.mock_BMS",
             },
             "disabled_by": None,
-            "discovery_keys": {},
+            "discovery_keys": {
+                "bluetooth": (
+                    DiscoveryKey(
+                        domain="bluetooth",
+                        key="cc:cc:cc:cc:cc:cc",
+                        version=1,
+                    ),
+                ),
+            },
             "domain": DOMAIN,
             "entry_id": REDACTED,
             "minor_version": 0,
@@ -135,10 +144,16 @@ async def test_diagnostics(
     inject_bluetooth_service_info_bleak(hass, bt_discovery)
     await ce.runtime_data._async_setup()
     await ce.runtime_data.async_refresh()
+    await hass.async_block_till_done(wait_background_tasks=True)
 
     diag_data: dict[str, Any] = await async_get_config_entry_diagnostics(
         hass, config_entry
     )
+    # patch the modified_at timestamp to match the expected value, since it is generated at runtime
+    expected_diag_data["config_entry"]["modified_at"] = (
+        expected_diag_data["config_entry"]["modified_at"][:20]
+        + diag_data["config_entry"]["modified_at"][20:]
+    )
 
     assert repr(diag_data.pop("advertisement_data")) == repr(
         expected_diag_data.pop("advertisement_data")