From 5e32fdff266b546a6190a898fbab375051e01448 Mon Sep 17 00:00:00 2001 From: Aaron Bach Date: Sat, 8 Oct 2022 15:06:10 -0600 Subject: [PATCH] Remove redundant ReCollect Waste test fixture (#79907) --- tests/components/recollect_waste/conftest.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/components/recollect_waste/conftest.py b/tests/components/recollect_waste/conftest.py index a0d002e9d9a..9373a9aa969 100644 --- a/tests/components/recollect_waste/conftest.py +++ b/tests/components/recollect_waste/conftest.py @@ -16,9 +16,13 @@ from tests.common import MockConfigEntry @pytest.fixture(name="config_entry") -def config_entry_fixture(hass, config, unique_id): +def config_entry_fixture(hass, config): """Define a config entry fixture.""" - entry = MockConfigEntry(domain=DOMAIN, unique_id=unique_id, data=config) + entry = MockConfigEntry( + domain=DOMAIN, + unique_id=f"{config[CONF_PLACE_ID]}, {config[CONF_SERVICE_ID]}", + data=config, + ) entry.add_to_hass(hass) return entry @@ -51,9 +55,3 @@ async def setup_recollect_waste_fixture(hass, config): assert await async_setup_component(hass, DOMAIN, config) await hass.async_block_till_done() yield - - -@pytest.fixture(name="unique_id") -def unique_id_fixture(hass): - """Define a config entry unique ID fixture.""" - return "12345, 12345"