8000 Remove unnecessary DOMAIN alias in tests (a-d) (#145817) · home-assistant/core@7da8e24 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7da8e24

Browse files
epenetepenet
authored
Remove unnecessary DOMAIN alias in tests (a-d) (#145817)
1 parent 9d0fc0d commit 7da8e24

40 files changed

+210
-243
lines changed

‎tests/components/abode/common.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from unittest.mock import patch
44

5-
from homeassistant.components.abode import DOMAIN as ABODE_DOMAIN
5+
from homeassistant.components.abode import DOMAIN
66
from homeassistant.components.abode.const import CONF_POLLING
77
from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
88
from homeassistant.core import HomeAssistant
@@ -14,7 +14,7 @@
1414
async def setup_platform(hass: HomeAssistant, platform: str) -> MockConfigEntry:
1515
"""Set up the Abode platform."""
1616
mock_entry = MockConfigEntry(
17-
domain=ABODE_DOMAIN,
17+
domain=DOMAIN,
1818
data={
1919
CONF_USERNAME: "user@email.com",
2020
CONF_PASSWORD: "password",
@@ -27,7 +27,7 @@ async def setup_platform(hass: HomeAssistant, platform: str) -> MockConfigEntry:
2727
patch("homeassistant.components.abode.PLATFORMS", [platform]),
2828
patch("jaraco.abode.event_controller.sio"),
2929
):
30-
assert await async_setup_component(hass, ABODE_DOMAIN, {})
30+
assert await async_setup_component(hass, DOMAIN, {})
3131
await hass.async_block_till_done()
3232

3333
return mock_entry

‎tests/components/abode/test_camera.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from unittest.mock import patch
44

5-
from homeassistant.components.abode.const import DOMAIN as ABODE_DOMAIN
5+
from homeassistant.components.abode.const import DOMAIN
66
from homeassistant.components.camera import DOMAIN as CAMERA_DOMAIN, CameraState
77
from homeassistant.const import ATTR_ENTITY_ID
88
from homeassistant.core import HomeAssistant
@@ -35,7 +35,7 @@ async def test_capture_image(hass: HomeAssistant) -> None:
3535

3636
with patch("jaraco.abode.devices.camera.Camera.capture") as mock_capture:
3737
await hass.services.async_call(
38-
ABODE_DOMAIN,
38+
DOMAIN,
3939
"capture_image",
4040
{ATTR_ENTITY_ID: "camera.test_cam"},
4141
blocking=True,

‎tests/components/abode/test_init.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Exception as AbodeException,
99
)
1010

11-
from homeassistant.components.abode import DOMAIN as ABODE_DOMAIN, SERVICE_SETTINGS
11+
from homeassistant.components.abode import DOMAIN, SERVICE_SETTINGS
1212
from homeassistant.components.alarm_control_panel import DOMAIN as ALARM_DOMAIN
1313
from homeassistant.config_entries import ConfigEntryState
1414
from homeassistant.const import CONF_USERNAME
@@ -23,7 +23,7 @@ async def test_change_settings(hass: HomeAssistant) -> None:
2323

2424
with patch("jaraco.abode.client.Client.set_setting") as mock_set_setting:
2525
await hass.services.async_call(
26-
ABODE_DOMAIN,
26+
DOMAIN,
2727
SERVICE_SETTINGS,
2828
{"setting": "confirm_snd", "value": "loud"},
2929
blocking=True,

‎tests/components/abode/test_switch.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
from unittest.mock import patch
44

5-
from homeassistant.components.abode import (
6-
DOMAIN as ABODE_DOMAIN,
7-
SERVICE_TRIGGER_AUTOMATION,
8-
)
5+
from homeassistant.components.abode import DOMAIN, SERVICE_TRIGGER_AUTOMATION
96
from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
107
from homeassistant.const import (
118
ATTR_ENTITY_ID,
@@ -119,7 +116,7 @@ async def test_trigger_automation(hass: HomeAssistant) -> None:
119116

120117
with patch("jaraco.abode.automation.Automation.trigger") as mock:
121118
await hass.services.async_call(
122-
ABODE_DOMAIN,
119+
DOMAIN,
123120
SERVICE_TRIGGER_AUTOMATION,
124121
{ATTR_ENTITY_ID: AUTOMATION_ID},
125122
blocking=True,

‎tests/components/advantage_air/test_sensor.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from datetime import timedelta
44
from unittest.mock import AsyncMock, patch
55

6-
from homeassistant.components.advantage_air.const import DOMAIN as ADVANTAGE_AIR_DOMAIN
6+
from homeassistant.components.advantage_air.const import DOMAIN
77
from homeassistant.components.advantage_air.sensor import (
88
ADVANTAGE_AIR_SERVICE_SET_TIME_TO,
99
ADVANTAGE_AIR_SET_COUNTDOWN_VALUE,
@@ -41,7 +41,7 @@ async def test_sensor_platform(
4141
value = 20
4242

4343
await hass.services.async_call(
44-
ADVANTAGE_AIR_DOMAIN,
44+
DOMAIN,
4545
ADVANTAGE_AIR_SERVICE_SET_TIME_TO,
4646
{ATTR_ENTITY_ID: [entity_id], ADVANTAGE_AIR_SET_COUNTDOWN_VALUE: value},
4747
blocking=True,
@@ -61,7 +61,7 @@ async def test_sensor_platform(
6161

6262
value = 0
6363
await hass.services.async_call(
64-
ADVANTAGE_AIR_DOMAIN,
64+
DOMAIN,
6565
ADVANTAGE_AIR_SERVICE_SET_TIME_TO,
6666
{ATTR_ENTITY_ID: [entity_id], ADVANTAGE_AIR_SET_COUNTDOWN_VALUE: value},
6767
blocking=True,

‎tests/components/alarm_control_panel/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import pytest
77

88
from homeassistant.components.alarm_control_panel import (
9-
DOMAIN as ALARM_CONTROL_PANEL_DOMAIN,
9+
DOMAIN,
1010
AlarmControlPanelEntity,
1111
AlarmControlPanelEntityFeature,
1212
)
@@ -202,7 +202,7 @@ async def async_setup_entry_platform(
202202

203203
mock_platform(
204204
hass,
205-
f"{TEST_DOMAIN}.{ALARM_CONTROL_PANEL_DOMAIN}",
205+
f"{TEST_DOMAIN}.{DOMAIN}",
206206
MockPlatform(async_setup_entry=async_setup_entry_platform),
207207
)
208208

‎tests/components/alarm_control_panel/test_init.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from homeassistant.components import alarm_control_panel
88
from homeassistant.components.alarm_control_panel import (
9-
DOMAIN as ALARM_CONTROL_PANEL_DOMAIN,
9+
DOMAIN,
1010
AlarmControlPanelEntityFeature,
1111
CodeFormat,
1212
)
@@ -280,9 +280,7 @@ def state(self) -> str:
280280
),
281281
built_in=False,
282282
)
283-
setup_test_component_platform(
284-
hass, ALARM_CONTROL_PANEL_DOMAIN, [entity], from_config_entry=True
285-
)
283+
setup_test_component_platform(hass, DOMAIN, [entity], from_config_entry=True)
286284
assert await hass.config_entries.async_setup(config_entry.entry_id)
287285

288286
state = hass.states.get(entity.entity_id)
@@ -343,9 +341,7 @@ def alarm_disarm(self, code: str | None = None) -> None:
343341
),
344342
built_in=False,
345343
)
346-
setup_test_component_platform(
347-
hass, ALARM_CONTROL_PANEL_DOMAIN, [entity], from_config_entry=True
348-
)
344+
setup_test_component_platform(hass, DOMAIN, [entity], from_config_entry=True)
349345
assert await hass.config_entries.async_setup(config_entry.entry_id)
350346

351347
state = hass.states.get(entity.entity_id)
@@ -426,9 +422,7 @@ def alarm_disarm(self, code: str | None = None) -> None:
426422
),
427423
built_in=False,
428424
)
429-
setup_test_component_platform(
430-
hass, ALARM_CONTROL_PANEL_DOMAIN, [entity], from_config_entry=True
431-
)
425+
setup_test_component_platform(hass, DOMAIN, [entity], from_config_entry=True)
432426
assert await hass.config_entries.async_setup(config_entry.entry_id)
433427

434428
state = hass.states.get(entity.entity_id)

‎tests/components/assist_satellite/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from homeassistant.components.assist_pipeline import PipelineEvent
99
from homeassistant.components.assist_satellite import (
10-
DOMAIN as AS_DOMAIN,
10+
DOMAIN,
1111
AssistSatelliteAnnouncement,
1212
AssistSatelliteConfiguration,
1313
AssistSatelliteEntity,
@@ -168,7 +168,7 @@ async def async_unload_entry_init(
168168
),
169169
)
170170
setup_test_component_platform(
171-
hass, AS_DOMAIN, [entity, entity2, entity_no_features], from_config_entry=True
171+
hass, DOMAIN, [entity, entity2, entity_no_features], from_config_entry=True
172172
)
173173
mock_platform(hass, f"{TEST_DOMAIN}.config_flow", Mock())
174174

‎tests/components/aussie_broadband/common.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
from typing import Any
44
from unittest.mock import patch
55

6-
from homeassistant.components.aussie_broadband.const import (
7-
CONF_SERVICES,
8-
DOMAIN as AUSSIE_BROADBAND_DOMAIN,
9-
)
6+
from homeassistant.components.aussie_broadband.const import CONF_SERVICES, DOMAIN
107
from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
118
from homeassistant.core import HomeAssistant
129
from homeassistant.helpers.typing import UNDEFINED, UndefinedType
@@ -49,7 +46,7 @@ async def setup_platform(
4946
):
5047
"""Set up the Aussie Broadband platform."""
5148
mock_entry = MockConfigEntry(
52-
domain=AUSSIE_BROADBAND_DOMAIN,
49+
domain=DOMAIN,
5350
data=FAKE_DATA,
5451
options={
5552
CONF_SERVICES: ["12345678", "87654321", "23456789", "98765432"],

‎tests/components/axis/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import pytest
1313
import respx
1414

15-
from homeassistant.components.axis.const import DOMAIN as AXIS_DOMAIN
15+
from homeassistant.components.axis.const import DOMAIN
1616
from homeassistant.const import (
1717
CONF_HOST,
1818
CONF_MODEL,
@@ -91,7 +91,7 @@ def fixture_config_entry(
9191
) -> MockConfigEntry:
9292
"""Define a config entry fixture."""
9393
return MockConfigEntry(
94-
domain=AXIS_DOMAIN,
94+
domain=DOMAIN,
9595
entry_id="676abe5b73621446e6550a2e86ffe3dd",
9696
unique_id=FORMATTED_MAC,
9797
data=config_entry_data,

0 commit comments

Comments
 (0)
0