Fix merge conflicts

hahn-th · Jan 28, 2025 · cfd0c63 · cfd0c63
1 parent 0bdb87f
commit cfd0c63
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/tests/aio_tests/test_async_device.py b/tests/aio_tests/test_async_device.py
@@ -599,7 +599,7 @@ async def test_heating_thermostat_evo(no_ssl_fake_async_home: AsyncHome):
 @pytest.mark.asyncio
 async def test_heating_thermostat_three(no_ssl_fake_async_home: AsyncHome):
     d = no_ssl_fake_async_home.search_device_by_id("3014F7110000000000000027")
-    assert isinstance(d, AsyncHeatingThermostatThree)
+    assert isinstance(d, AsyncHeatingThermostat)
     assert d.label == "Heizkoerper"
     assert d.manufacturerCode == 1
     assert d.modelId == 575
@@ -642,7 +642,7 @@ async def test_heating_thermostat_three(no_ssl_fake_async_home: AsyncHome):
 @pytest.mark.asyncio
 async def test_heating_thermostat_flex(no_ssl_fake_async_home: AsyncHome):
     d = no_ssl_fake_async_home.search_device_by_id("3014F7110000000000000028")
-    assert isinstance(d, AsyncHeatingThermostatFlex)
+    assert isinstance(d, AsyncHeatingThermostat)
     assert d.label == "Heizkoerperthermostat"
     assert d.manufacturerCode == 1
     assert d.modelId == 527

diff --git a/tests/test_devices.py b/tests/test_devices.py
@@ -1803,4 +1803,10 @@ def test_rgbw_dimmer(fake_home: Home):
     with no_ssl_verification():
         d = fake_home.search_device_by_id("3014F711000000000000RGBW")
         assert d is not None
-        assert isinstance(d, RgbwDimmer)
+        assert isinstance(d, RgbwDimmer)
+
+def test_wired_carbon_temperature_humidity_sensor_display(fake_home: Home):
+    with no_ssl_verification():
+        d = fake_home.search_device_by_id("3014F71100000000000SCTHD")
+        assert isinstance(d, WiredCarbonTemperatureHumiditySensorDisplay)
+        assert d.label == "CO2 Sensor Wohnen"