diff --git a/tests/components/nest/test_device_trigger.py b/tests/components/nest/test_device_trigger.py index ea888d32fd6..f659568c674 100644 --- a/tests/components/nest/test_device_trigger.py +++ b/tests/components/nest/test_device_trigger.py @@ -1,6 +1,7 @@ """The tests for Nest device triggers.""" from google_nest_sdm.event import EventMessage import pytest +from pytest_unordered import unordered import homeassistant.components.automation as automation from homeassistant.components.device_automation import DeviceAutomationType @@ -17,7 +18,6 @@ from homeassistant.util.dt import utcnow from .common import DEVICE_ID, CreateDevice, FakeSubscriber, PlatformSetup from tests.common import ( - assert_lists_same, async_get_device_automations, async_mock_service, ) @@ -124,7 +124,7 @@ async def test_get_triggers( triggers = await async_get_device_automations( hass, DeviceAutomationType.TRIGGER, device_entry.id ) - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) async def test_multiple_devices( diff --git a/tests/components/netatmo/test_device_trigger.py b/tests/components/netatmo/test_device_trigger.py index 7d29ccb794a..29a0b46a97c 100644 --- a/tests/components/netatmo/test_device_trigger.py +++ b/tests/components/netatmo/test_device_trigger.py @@ -1,5 +1,6 @@ """The tests for Netatmo device triggers.""" import pytest +from pytest_unordered import unordered import homeassistant.components.automation as automation from homeassistant.components.device_automation import DeviceAutomationType @@ -18,7 +19,6 @@ from homeassistant.setup import async_setup_component from tests.common import ( MockConfigEntry, - assert_lists_same, async_capture_events, async_get_device_automations, async_mock_service, @@ -92,7 +92,7 @@ async def test_get_triggers( ) if trigger["domain"] == NETATMO_DOMAIN ] - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) @pytest.mark.parametrize( diff --git a/tests/components/number/test_device_action.py b/tests/components/number/test_device_action.py index 9cd8d3d4943..70422974422 100644 --- a/tests/components/number/test_device_action.py +++ b/tests/components/number/test_device_action.py @@ -1,5 +1,6 @@ """The tests for Number device actions.""" import pytest +from pytest_unordered import unordered import voluptuous_serialize import homeassistant.components.automation as automation @@ -17,7 +18,6 @@ from homeassistant.setup import async_setup_component from tests.common import ( MockConfigEntry, - assert_lists_same, async_get_device_automations, async_mock_service, ) @@ -56,7 +56,7 @@ async def test_get_actions( actions = await async_get_device_automations( hass, DeviceAutomationType.ACTION, device_entry.id ) - assert_lists_same(actions, expected_actions) + assert actions == unordered(expected_actions) @pytest.mark.parametrize( @@ -104,7 +104,7 @@ async def test_get_actions_hidden_auxiliary( actions = await async_get_device_automations( hass, DeviceAutomationType.ACTION, device_entry.id ) - assert_lists_same(actions, expected_actions) + assert actions == unordered(expected_actions) async def test_get_action_no_state( @@ -134,7 +134,7 @@ async def test_get_action_no_state( actions = await async_get_device_automations( hass, DeviceAutomationType.ACTION, device_entry.id ) - assert_lists_same(actions, expected_actions) + assert actions == unordered(expected_actions) async def test_action(hass: HomeAssistant) -> None: diff --git a/tests/components/nut/test_device_action.py b/tests/components/nut/test_device_action.py index 0664b0de5c8..c15a2157343 100644 --- a/tests/components/nut/test_device_action.py +++ b/tests/components/nut/test_device_action.py @@ -3,6 +3,7 @@ from unittest.mock import MagicMock from pynut2.nut2 import PyNUTError import pytest +from pytest_unordered import unordered from homeassistant.components import automation, device_automation from homeassistant.components.device_automation import DeviceAutomationType @@ -14,7 +15,7 @@ from homeassistant.setup import async_setup_component from .util import async_init_integration -from tests.common import assert_lists_same, async_get_device_automations +from tests.common import async_get_device_automations async def test_get_all_actions_for_specified_user( @@ -47,7 +48,7 @@ async def test_get_all_actions_for_specified_user( actions = await async_get_device_automations( hass, DeviceAutomationType.ACTION, device_entry.id ) - assert_lists_same(actions, expected_actions) + assert actions == unordered(expected_actions) async def test_no_actions_for_anonymous_user( diff --git a/tests/components/philips_js/test_device_trigger.py b/tests/components/philips_js/test_device_trigger.py index 339b30d6355..897bc5ebc70 100644 --- a/tests/components/philips_js/test_device_trigger.py +++ b/tests/components/philips_js/test_device_trigger.py @@ -1,5 +1,6 @@ """The tests for Philips TV device triggers.""" import pytest +from pytest_unordered import unordered import homeassistant.components.automation as automation from homeassistant.components.device_automation import DeviceAutomationType @@ -8,7 +9,6 @@ from homeassistant.core import HomeAssistant from homeassistant.setup import async_setup_component from tests.common import ( - assert_lists_same, async_get_device_automations, async_mock_service, ) @@ -40,7 +40,7 @@ async def test_get_triggers(hass: HomeAssistant, mock_device) -> None: hass, DeviceAutomationType.TRIGGER, mock_device.id ) triggers = [trigger for trigger in triggers if trigger["domain"] == DOMAIN] - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) async def test_if_fires_on_turn_on_request( diff --git a/tests/components/remote/test_device_action.py b/tests/components/remote/test_device_action.py index d652f4d869d..563136e5d6d 100644 --- a/tests/components/remote/test_device_action.py +++ b/tests/components/remote/test_device_action.py @@ -1,5 +1,6 @@ """The test for remote device automation.""" import pytest +from pytest_unordered import unordered import homeassistant.components.automation as automation from homeassistant.components.device_automation import DeviceAutomationType @@ -12,7 +13,6 @@ from homeassistant.setup import async_setup_component from tests.common import ( MockConfigEntry, - assert_lists_same, async_get_device_automations, async_mock_service, ) @@ -57,7 +57,7 @@ async def test_get_actions( actions = await async_get_device_automations( hass, DeviceAutomationType.ACTION, device_entry.id ) - assert_lists_same(actions, expected_actions) + assert actions == unordered(expected_actions) @pytest.mark.parametrize( @@ -105,7 +105,7 @@ async def test_get_actions_hidden_auxiliary( actions = await async_get_device_automations( hass, DeviceAutomationType.ACTION, device_entry.id ) - assert_lists_same(actions, expected_actions) + assert actions == unordered(expected_actions) async def test_action( diff --git a/tests/components/remote/test_device_condition.py b/tests/components/remote/test_device_condition.py index a0899daf0af..51ca928b39c 100644 --- a/tests/components/remote/test_device_condition.py +++ b/tests/components/remote/test_device_condition.py @@ -3,6 +3,7 @@ from datetime import timedelta from freezegun import freeze_time import pytest +from pytest_unordered import unordered import homeassistant.components.automation as automation from homeassistant.components.device_automation import DeviceAutomationType @@ -16,7 +17,6 @@ import homeassistant.util.dt as dt_util from tests.common import ( MockConfigEntry, - assert_lists_same, async_get_device_automation_capabilities, async_get_device_automations, async_mock_service, @@ -63,7 +63,7 @@ async def test_get_conditions( conditions = await async_get_device_automations( hass, DeviceAutomationType.CONDITION, device_entry.id ) - assert_lists_same(conditions, expected_conditions) + assert conditions == unordered(expected_conditions) @pytest.mark.parametrize( @@ -111,7 +111,7 @@ async def test_get_conditions_hidden_auxiliary( conditions = await async_get_device_automations( hass, DeviceAutomationType.CONDITION, device_entry.id ) - assert_lists_same(conditions, expected_conditions) + assert conditions == unordered(expected_conditions) async def test_get_condition_capabilities( diff --git a/tests/components/remote/test_device_trigger.py b/tests/components/remote/test_device_trigger.py index fdd7b9e73ed..d45d15b67ee 100644 --- a/tests/components/remote/test_device_trigger.py +++ b/tests/components/remote/test_device_trigger.py @@ -2,6 +2,7 @@ from datetime import timedelta import pytest +from pytest_unordered import unordered import homeassistant.components.automation as automation from homeassistant.components.device_automation import DeviceAutomationType @@ -15,7 +16,6 @@ import homeassistant.util.dt as dt_util from tests.common import ( MockConfigEntry, - assert_lists_same, async_fire_time_changed, async_get_device_automation_capabilities, async_get_device_automations, @@ -63,7 +63,7 @@ async def test_get_triggers( triggers = await async_get_device_automations( hass, DeviceAutomationType.TRIGGER, device_entry.id ) - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) @pytest.mark.parametrize( @@ -111,7 +111,7 @@ async def test_get_triggers_hidden_auxiliary( triggers = await async_get_device_automations( hass, DeviceAutomationType.TRIGGER, device_entry.id ) - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) async def test_get_trigger_capabilities( diff --git a/tests/components/rfxtrx/test_device_action.py b/tests/components/rfxtrx/test_device_action.py index c2c50cbca8c..d53ef6a7a02 100644 --- a/tests/components/rfxtrx/test_device_action.py +++ b/tests/components/rfxtrx/test_device_action.py @@ -4,6 +4,7 @@ from __future__ import annotations from typing import Any, NamedTuple import pytest +from pytest_unordered import unordered import RFXtrx import homeassistant.components.automation as automation @@ -17,7 +18,6 @@ from .conftest import create_rfx_test_cfg from tests.common import ( MockConfigEntry, - assert_lists_same, async_get_device_automations, ) @@ -107,7 +107,7 @@ async def test_get_actions( for action_type in expected ] - assert_lists_same(actions, expected_actions) + assert actions == unordered(expected_actions) @pytest.mark.parametrize( diff --git a/tests/components/rfxtrx/test_device_trigger.py b/tests/components/rfxtrx/test_device_trigger.py index c33e6c94f64..02e9ec87630 100644 --- a/tests/components/rfxtrx/test_device_trigger.py +++ b/tests/components/rfxtrx/test_device_trigger.py @@ -4,6 +4,7 @@ from __future__ import annotations from typing import Any, NamedTuple import pytest +from pytest_unordered import unordered import homeassistant.components.automation as automation from homeassistant.components.device_automation import DeviceAutomationType @@ -16,7 +17,6 @@ from .conftest import create_rfx_test_cfg from tests.common import ( MockConfigEntry, - assert_lists_same, async_get_device_automations, async_mock_service, ) @@ -113,7 +113,7 @@ async def test_get_triggers( hass, DeviceAutomationType.TRIGGER, device_entry.id ) triggers = [value for value in triggers if value["domain"] == "rfxtrx"] - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) @pytest.mark.parametrize( diff --git a/tests/components/select/test_device_action.py b/tests/components/select/test_device_action.py index 168e47d5d68..a517d16ad9e 100644 --- a/tests/components/select/test_device_action.py +++ b/tests/components/select/test_device_action.py @@ -1,5 +1,6 @@ """The tests for Select device actions.""" import pytest +from pytest_unordered import unordered import voluptuous_serialize from homeassistant.components import automation @@ -17,7 +18,6 @@ from homeassistant.setup import async_setup_component from tests.common import ( MockConfigEntry, - assert_lists_same, async_get_device_automations, async_mock_service, ) @@ -57,7 +57,7 @@ async def test_get_actions( actions = await async_get_device_automations( hass, DeviceAutomationType.ACTION, device_entry.id ) - assert_lists_same(actions, expected_actions) + assert actions == unordered(expected_actions) @pytest.mark.parametrize( @@ -111,7 +111,7 @@ async def test_get_actions_hidden_auxiliary( actions = await async_get_device_automations( hass, DeviceAutomationType.ACTION, device_entry.id ) - assert_lists_same(actions, expected_actions) + assert actions == unordered(expected_actions) @pytest.mark.parametrize("action_type", ("select_first", "select_last")) diff --git a/tests/components/select/test_device_condition.py b/tests/components/select/test_device_condition.py index 738089e7f9b..1ff237e2641 100644 --- a/tests/components/select/test_device_condition.py +++ b/tests/components/select/test_device_condition.py @@ -2,6 +2,7 @@ from __future__ import annotations import pytest +from pytest_unordered import unordered import voluptuous_serialize from homeassistant.components import automation @@ -21,7 +22,6 @@ from homeassistant.setup import async_setup_component from tests.common import ( MockConfigEntry, - assert_lists_same, async_get_device_automations, async_mock_service, ) @@ -61,7 +61,7 @@ async def test_get_conditions( conditions = await async_get_device_automations( hass, DeviceAutomationType.CONDITION, device_entry.id ) - assert_lists_same(conditions, expected_conditions) + assert conditions == unordered(expected_conditions) @pytest.mark.parametrize( @@ -109,7 +109,7 @@ async def test_get_conditions_hidden_auxiliary( conditions = await async_get_device_automations( hass, DeviceAutomationType.CONDITION, device_entry.id ) - assert_lists_same(conditions, expected_conditions) + assert conditions == unordered(expected_conditions) async def test_if_selected_option( diff --git a/tests/components/select/test_device_trigger.py b/tests/components/select/test_device_trigger.py index ed33884bff9..45522892c6b 100644 --- a/tests/components/select/test_device_trigger.py +++ b/tests/components/select/test_device_trigger.py @@ -2,6 +2,7 @@ from __future__ import annotations import pytest +from pytest_unordered import unordered import voluptuous_serialize from homeassistant.components import automation @@ -21,7 +22,6 @@ from homeassistant.setup import async_setup_component from tests.common import ( MockConfigEntry, - assert_lists_same, async_get_device_automations, async_mock_service, ) @@ -61,7 +61,7 @@ async def test_get_triggers( triggers = await async_get_device_automations( hass, DeviceAutomationType.TRIGGER, device_entry.id ) - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) @pytest.mark.parametrize( @@ -109,7 +109,7 @@ async def test_get_triggers_hidden_auxiliary( triggers = await async_get_device_automations( hass, DeviceAutomationType.TRIGGER, device_entry.id ) - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) async def test_if_fires_on_state_change(hass: HomeAssistant, calls) -> None: diff --git a/tests/components/sensor/test_device_condition.py b/tests/components/sensor/test_device_condition.py index dcd7e16a514..1989f95c789 100644 --- a/tests/components/sensor/test_device_condition.py +++ b/tests/components/sensor/test_device_condition.py @@ -1,5 +1,6 @@ """The test for sensor device automation.""" import pytest +from pytest_unordered import unordered import homeassistant.components.automation as automation from homeassistant.components.device_automation import DeviceAutomationType @@ -21,7 +22,6 @@ from homeassistant.util.json import load_json from tests.common import ( MockConfigEntry, - assert_lists_same, async_get_device_automation_capabilities, async_get_device_automations, async_mock_service, @@ -124,7 +124,7 @@ async def test_get_conditions( hass, DeviceAutomationType.CONDITION, device_entry.id ) assert len(conditions) == 27 - assert_lists_same(conditions, expected_conditions) + assert conditions == unordered(expected_conditions) @pytest.mark.parametrize( @@ -173,7 +173,7 @@ async def test_get_conditions_hidden_auxiliary( conditions = await async_get_device_automations( hass, DeviceAutomationType.CONDITION, device_entry.id ) - assert_lists_same(conditions, expected_conditions) + assert conditions == unordered(expected_conditions) async def test_get_conditions_no_state( @@ -218,7 +218,7 @@ async def test_get_conditions_no_state( conditions = await async_get_device_automations( hass, DeviceAutomationType.CONDITION, device_entry.id ) - assert_lists_same(conditions, expected_conditions) + assert conditions == unordered(expected_conditions) @pytest.mark.parametrize( @@ -268,7 +268,7 @@ async def test_get_conditions_no_unit_or_stateclass( conditions = await async_get_device_automations( hass, DeviceAutomationType.CONDITION, device_entry.id ) - assert_lists_same(conditions, expected_conditions) + assert conditions == unordered(expected_conditions) @pytest.mark.parametrize( diff --git a/tests/components/sensor/test_device_trigger.py b/tests/components/sensor/test_device_trigger.py index 010c947e7ab..d2d3da7e8ff 100644 --- a/tests/components/sensor/test_device_trigger.py +++ b/tests/components/sensor/test_device_trigger.py @@ -2,6 +2,7 @@ from datetime import timedelta import pytest +from pytest_unordered import unordered import homeassistant.components.automation as automation from homeassistant.components.device_automation import DeviceAutomationType @@ -24,7 +25,6 @@ from homeassistant.util.json import load_json from tests.common import ( MockConfigEntry, - assert_lists_same, async_fire_time_changed, async_get_device_automation_capabilities, async_get_device_automations, @@ -126,7 +126,7 @@ async def test_get_triggers( hass, DeviceAutomationType.TRIGGER, device_entry.id ) assert len(triggers) == 27 - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) @pytest.mark.parametrize( @@ -175,7 +175,7 @@ async def test_get_triggers_hidden_auxiliary( triggers = await async_get_device_automations( hass, DeviceAutomationType.TRIGGER, device_entry.id ) - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) @pytest.mark.parametrize( @@ -225,7 +225,7 @@ async def test_get_triggers_no_unit_or_stateclass( triggers = await async_get_device_automations( hass, DeviceAutomationType.TRIGGER, device_entry.id ) - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) @pytest.mark.parametrize( diff --git a/tests/components/shelly/test_device_trigger.py b/tests/components/shelly/test_device_trigger.py index 30a7cfe75d8..6e8c3bf8005 100644 --- a/tests/components/shelly/test_device_trigger.py +++ b/tests/components/shelly/test_device_trigger.py @@ -1,5 +1,6 @@ """The tests for Shelly device triggers.""" import pytest +from pytest_unordered import unordered from homeassistant.components import automation from homeassistant.components.device_automation import DeviceAutomationType @@ -26,7 +27,6 @@ from . import init_integration from tests.common import ( MockConfigEntry, - assert_lists_same, async_get_device_automations, ) @@ -74,7 +74,7 @@ async def test_get_triggers_block_device( hass, DeviceAutomationType.TRIGGER, device.id ) triggers = [value for value in triggers if value["domain"] == DOMAIN] - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) async def test_get_triggers_rpc_device(hass: HomeAssistant, mock_rpc_device) -> None: @@ -106,7 +106,7 @@ async def test_get_triggers_rpc_device(hass: HomeAssistant, mock_rpc_device) -> hass, DeviceAutomationType.TRIGGER, device.id ) triggers = [value for value in triggers if value["domain"] == DOMAIN] - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) async def test_get_triggers_button(hass: HomeAssistant, mock_block_device) -> None: @@ -131,7 +131,7 @@ async def test_get_triggers_button(hass: HomeAssistant, mock_block_device) -> No hass, DeviceAutomationType.TRIGGER, device.id ) triggers = [value for value in triggers if value["domain"] == DOMAIN] - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) async def test_get_triggers_non_initialized_devices( @@ -149,7 +149,7 @@ async def test_get_triggers_non_initialized_devices( hass, DeviceAutomationType.TRIGGER, device.id ) triggers = [value for value in triggers if value["domain"] == DOMAIN] - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) async def test_get_triggers_for_invalid_device_id( diff --git a/tests/components/switch/test_device_action.py b/tests/components/switch/test_device_action.py index 623629e4b91..1acea0b107a 100644 --- a/tests/components/switch/test_device_action.py +++ b/tests/components/switch/test_device_action.py @@ -1,5 +1,6 @@ """The test for switch device automation.""" import pytest +from pytest_unordered import unordered import homeassistant.components.automation as automation from homeassistant.components.device_automation import DeviceAutomationType @@ -12,7 +13,6 @@ from homeassistant.setup import async_setup_component from tests.common import ( MockConfigEntry, - assert_lists_same, async_get_device_automations, async_mock_service, ) @@ -58,7 +58,7 @@ async def test_get_actions( actions = await async_get_device_automations( hass, DeviceAutomationType.ACTION, device_entry.id ) - assert_lists_same(actions, expected_actions) + assert actions == unordered(expected_actions) @pytest.mark.parametrize( @@ -106,7 +106,7 @@ async def test_get_actions_hidden_auxiliary( actions = await async_get_device_automations( hass, DeviceAutomationType.ACTION, device_entry.id ) - assert_lists_same(actions, expected_actions) + assert actions == unordered(expected_actions) async def test_action( diff --git a/tests/components/switch/test_device_condition.py b/tests/components/switch/test_device_condition.py index 22f5a562daf..e2512624c15 100644 --- a/tests/components/switch/test_device_condition.py +++ b/tests/components/switch/test_device_condition.py @@ -3,6 +3,7 @@ from datetime import timedelta from freezegun import freeze_time import pytest +from pytest_unordered import unordered import homeassistant.components.automation as automation from homeassistant.components.device_automation import DeviceAutomationType @@ -16,7 +17,6 @@ import homeassistant.util.dt as dt_util from tests.common import ( MockConfigEntry, - assert_lists_same, async_get_device_automation_capabilities, async_get_device_automations, async_mock_service, @@ -63,7 +63,7 @@ async def test_get_conditions( conditions = await async_get_device_automations( hass, DeviceAutomationType.CONDITION, device_entry.id ) - assert_lists_same(conditions, expected_conditions) + assert conditions == unordered(expected_conditions) @pytest.mark.parametrize( @@ -111,7 +111,7 @@ async def test_get_conditions_hidden_auxiliary( conditions = await async_get_device_automations( hass, DeviceAutomationType.CONDITION, device_entry.id ) - assert_lists_same(conditions, expected_conditions) + assert conditions == unordered(expected_conditions) async def test_get_condition_capabilities( diff --git a/tests/components/switch/test_device_trigger.py b/tests/components/switch/test_device_trigger.py index 58ffa7e7c18..7ca2e480f4d 100644 --- a/tests/components/switch/test_device_trigger.py +++ b/tests/components/switch/test_device_trigger.py @@ -2,6 +2,7 @@ from datetime import timedelta import pytest +from pytest_unordered import unordered import homeassistant.components.automation as automation from homeassistant.components.device_automation import DeviceAutomationType @@ -15,7 +16,6 @@ import homeassistant.util.dt as dt_util from tests.common import ( MockConfigEntry, - assert_lists_same, async_fire_time_changed, async_get_device_automation_capabilities, async_get_device_automations, @@ -63,7 +63,7 @@ async def test_get_triggers( triggers = await async_get_device_automations( hass, DeviceAutomationType.TRIGGER, device_entry.id ) - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) @pytest.mark.parametrize( @@ -111,7 +111,7 @@ async def test_get_triggers_hidden_auxiliary( triggers = await async_get_device_automations( hass, DeviceAutomationType.TRIGGER, device_entry.id ) - assert_lists_same(triggers, expected_triggers) + assert triggers == unordered(expected_triggers) async def test_get_trigger_capabilities(