From 0ccf8ffbc6b41e3b37c5a218575551d8767bc29e Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Thu, 4 Jan 2024 02:45:47 -1000 Subject: [PATCH] Bump habluetooth to 2.0.2 (#107097) --- .../components/bluetooth/manifest.json | 2 +- homeassistant/package_constraints.txt | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- tests/components/bluetooth/test_wrappers.py | 32 +++++++++++++++++++ 5 files changed, 36 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/bluetooth/manifest.json b/homeassistant/components/bluetooth/manifest.json index c5dec12fe40..7308f3a83ff 100644 --- a/homeassistant/components/bluetooth/manifest.json +++ b/homeassistant/components/bluetooth/manifest.json @@ -20,6 +20,6 @@ "bluetooth-auto-recovery==1.2.3", "bluetooth-data-tools==1.19.0", "dbus-fast==2.21.0", - "habluetooth==2.0.1" + "habluetooth==2.0.2" ] } diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt index 9038f448529..6d55edc5163 100644 --- a/homeassistant/package_constraints.txt +++ b/homeassistant/package_constraints.txt @@ -24,7 +24,7 @@ dbus-fast==2.21.0 fnv-hash-fast==0.5.0 ha-av==10.1.1 ha-ffmpeg==3.1.0 -habluetooth==2.0.1 +habluetooth==2.0.2 hass-nabucasa==0.75.1 hassil==1.5.1 home-assistant-bluetooth==1.11.0 diff --git a/requirements_all.txt b/requirements_all.txt index 169b5527292..76501f18f54 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -998,7 +998,7 @@ ha-philipsjs==3.1.1 habitipy==0.2.0 # homeassistant.components.bluetooth -habluetooth==2.0.1 +habluetooth==2.0.2 # homeassistant.components.cloud hass-nabucasa==0.75.1 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index e7a8458d312..e293d61e75e 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -803,7 +803,7 @@ ha-philipsjs==3.1.1 habitipy==0.2.0 # homeassistant.components.bluetooth -habluetooth==2.0.1 +habluetooth==2.0.2 # homeassistant.components.cloud hass-nabucasa==0.75.1 diff --git a/tests/components/bluetooth/test_wrappers.py b/tests/components/bluetooth/test_wrappers.py index cc837f381d4..e3531a57447 100644 --- a/tests/components/bluetooth/test_wrappers.py +++ b/tests/components/bluetooth/test_wrappers.py @@ -367,6 +367,38 @@ async def test_we_switch_adapters_on_failure( cancel_hci1() +async def test_passing_subclassed_str_as_address( + hass: HomeAssistant, + two_adapters: None, + enable_bluetooth: None, + install_bleak_catcher, +) -> None: + """Ensure the client wrapper can handle a subclassed str as the address.""" + _, cancel_hci0, cancel_hci1 = _generate_scanners_with_fake_devices(hass) + + class SubclassedStr(str): + pass + + address = SubclassedStr("00:00:00:00:00:01") + client = bleak.BleakClient(address) + + class FakeBleakClient(BaseFakeBleakClient): + """Fake bleak client.""" + + async def connect(self, *args, **kwargs): + """Connect.""" + return True + + with patch( + "habluetooth.wrappers.get_platform_client_backend_type", + return_value=FakeBleakClient, + ): + assert await client.connect() is True + + cancel_hci0() + cancel_hci1() + + async def test_raise_after_shutdown( hass: HomeAssistant, two_adapters: None,