diff --git a/tests/components/tuya/conftest.py b/tests/components/tuya/conftest.py index 37f1688bb63..6d87aeef049 100644 --- a/tests/components/tuya/conftest.py +++ b/tests/components/tuya/conftest.py @@ -4,6 +4,7 @@ from collections.abc import Generator from unittest.mock import MagicMock, patch import pytest +from tuya_device_handlers import TUYA_QUIRKS_REGISTRY from tuya_sharing import CustomerDevice, Manager from homeassistant.components.tuya.const import ( @@ -139,3 +140,13 @@ def notification_helper( ) -> TuyaNotificationHelper: """Fixture for Tuya NotificationHelper.""" return TuyaNotificationHelper(hass, mock_manager) + + +@pytest.fixture +def no_quirk() -> Generator[None]: + """Fixture to bypass all quirk registration.""" + with ( + patch.dict(TUYA_QUIRKS_REGISTRY._quirks, clear=True), + patch("homeassistant.components.tuya.coordinator.register_tuya_quirks"), + ): + yield diff --git a/tests/components/tuya/test_alarm_control_panel.py b/tests/components/tuya/test_alarm_control_panel.py index 8170c20b082..5af99e9886c 100644 --- a/tests/components/tuya/test_alarm_control_panel.py +++ b/tests/components/tuya/test_alarm_control_panel.py @@ -33,6 +33,7 @@ def platform_autouse(): yield +@pytest.mark.usefixtures("no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_binary_sensor.py b/tests/components/tuya/test_binary_sensor.py index f913768b986..03ff43e786c 100644 --- a/tests/components/tuya/test_binary_sensor.py +++ b/tests/components/tuya/test_binary_sensor.py @@ -24,7 +24,7 @@ def platform_autouse(): yield -@pytest.mark.usefixtures("entity_registry_enabled_by_default") +@pytest.mark.usefixtures("entity_registry_enabled_by_default", "no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_button.py b/tests/components/tuya/test_button.py index 44211290e8b..b75f7c3c29c 100644 --- a/tests/components/tuya/test_button.py +++ b/tests/components/tuya/test_button.py @@ -23,7 +23,7 @@ def platform_autouse(): yield -@pytest.mark.usefixtures("entity_registry_enabled_by_default") +@pytest.mark.usefixtures("entity_registry_enabled_by_default", "no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_camera.py b/tests/components/tuya/test_camera.py index 413b6d581a3..c7061a7b21b 100644 --- a/tests/components/tuya/test_camera.py +++ b/tests/components/tuya/test_camera.py @@ -35,6 +35,7 @@ def platform_autouse(): yield +@pytest.mark.usefixtures("no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_climate.py b/tests/components/tuya/test_climate.py index e9b7225e206..edce2b0c89b 100644 --- a/tests/components/tuya/test_climate.py +++ b/tests/components/tuya/test_climate.py @@ -53,6 +53,7 @@ def platform_autouse(): yield +@pytest.mark.usefixtures("no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_cover.py b/tests/components/tuya/test_cover.py index 11288601cc1..0ffe9eab119 100644 --- a/tests/components/tuya/test_cover.py +++ b/tests/components/tuya/test_cover.py @@ -41,6 +41,7 @@ def platform_autouse(): yield +@pytest.mark.usefixtures("no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_event.py b/tests/components/tuya/test_event.py index 9d9998d59d4..101f16ef5cc 100644 --- a/tests/components/tuya/test_event.py +++ b/tests/components/tuya/test_event.py @@ -25,6 +25,7 @@ def platform_autouse(): @pytest.mark.freeze_time("2023-11-01 13:14:15+01:00") +@pytest.mark.usefixtures("no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_fan.py b/tests/components/tuya/test_fan.py index 317ad4c68bf..f2c15d164bf 100644 --- a/tests/components/tuya/test_fan.py +++ b/tests/components/tuya/test_fan.py @@ -31,6 +31,7 @@ def platform_autouse(): yield +@pytest.mark.usefixtures("no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_humidifier.py b/tests/components/tuya/test_humidifier.py index 0476a9d8dfb..5d82d87295e 100644 --- a/tests/components/tuya/test_humidifier.py +++ b/tests/components/tuya/test_humidifier.py @@ -31,6 +31,7 @@ def platform_autouse(): yield +@pytest.mark.usefixtures("no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_init.py b/tests/components/tuya/test_init.py index 6ff5d55aae4..ca68b7ad941 100644 --- a/tests/components/tuya/test_init.py +++ b/tests/components/tuya/test_init.py @@ -108,6 +108,7 @@ async def test_registry_cleanup_multiple_entries( assert entity_registry.async_get(second_entity_id) +@pytest.mark.usefixtures("no_quirk") async def test_device_registry( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_light.py b/tests/components/tuya/test_light.py index 75652337b8a..2d364cc6e3e 100644 --- a/tests/components/tuya/test_light.py +++ b/tests/components/tuya/test_light.py @@ -32,6 +32,7 @@ def platform_autouse(): yield +@pytest.mark.usefixtures("no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_number.py b/tests/components/tuya/test_number.py index 9e6ab4509ee..ab782270f83 100644 --- a/tests/components/tuya/test_number.py +++ b/tests/components/tuya/test_number.py @@ -35,6 +35,7 @@ def platform_autouse(): yield +@pytest.mark.usefixtures("no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_select.py b/tests/components/tuya/test_select.py index 96051d75635..efa6a1dc313 100644 --- a/tests/components/tuya/test_select.py +++ b/tests/components/tuya/test_select.py @@ -30,6 +30,7 @@ def platform_autouse(): yield +@pytest.mark.usefixtures("no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_sensor.py b/tests/components/tuya/test_sensor.py index 827b04cec82..fd8618eb56b 100644 --- a/tests/components/tuya/test_sensor.py +++ b/tests/components/tuya/test_sensor.py @@ -31,7 +31,7 @@ def platform_autouse(): yield -@pytest.mark.usefixtures("entity_registry_enabled_by_default") +@pytest.mark.usefixtures("entity_registry_enabled_by_default", "no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_siren.py b/tests/components/tuya/test_siren.py index c502a10b34b..b6f18ba8542 100644 --- a/tests/components/tuya/test_siren.py +++ b/tests/components/tuya/test_siren.py @@ -29,6 +29,7 @@ def platform_autouse(): yield +@pytest.mark.usefixtures("no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_switch.py b/tests/components/tuya/test_switch.py index 9939c600637..37e13cefbb2 100644 --- a/tests/components/tuya/test_switch.py +++ b/tests/components/tuya/test_switch.py @@ -29,6 +29,7 @@ def platform_autouse(): yield +@pytest.mark.usefixtures("no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_vacuum.py b/tests/components/tuya/test_vacuum.py index d69589b6454..26c0a2c83de 100644 --- a/tests/components/tuya/test_vacuum.py +++ b/tests/components/tuya/test_vacuum.py @@ -33,6 +33,7 @@ def platform_autouse(): yield +@pytest.mark.usefixtures("no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager, diff --git a/tests/components/tuya/test_valve.py b/tests/components/tuya/test_valve.py index 6bceb5ce605..b3a391cb65b 100644 --- a/tests/components/tuya/test_valve.py +++ b/tests/components/tuya/test_valve.py @@ -29,6 +29,7 @@ def platform_autouse(): yield +@pytest.mark.usefixtures("no_quirk") async def test_platform_setup_and_discovery( hass: HomeAssistant, mock_manager: Manager,