8000 Use async_load_fixture in remaining tests (#146021) · home-assistant/core@54c20d5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 54c20d5

Browse files
epenetepenet
authored
Use async_load_fixture in remaining tests (#146021)
1 parent 2dbf24e commit 54c20d5

File tree

8 files changed

+51
-30
lines changed

8 files changed

+51
-30
lines changed

‎tests/components/hassio/test_backup.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
from .test_init import MOCK_ENVIRON
5656

57-
from tests.common import load_json_object_fixture, mock_platform
57+
from tests.common import async_load_json_object_fixture, mock_platform
5858
from tests.typing import ClientSessionGenerator, WebSocketGenerator
5959

6060
TEST_BACKUP = supervisor_backups.Backup(
@@ -1018,8 +1018,10 @@ async def test_reader_writer_create_addon_folder_error(
10181018
supervisor_client.jobs.get_job.side_effect = [
10191019
TEST_JOB_NOT_DONE,
10201020
supervisor_jobs.Job.from_dict(
1021-
load_json_object_fixture(
1022-
"backup_done_with_addon_folder_errors.json", DOMAIN
1021+
(
1022+
await async_load_json_object_fixture(
1023+
hass, "backup_done_with_addon_folder_errors.json", DOMAIN
1024+
)
10231025
)["data"]
10241026
),
10251027
]

‎tests/components/hunterdouglas_powerview/test_config_flow.py

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

1616
from .const import DHCP_DATA, DISCOVERY_DATA, HOMEKIT_DATA, MOCK_SERIAL
1717

18-
from tests.common import MockConfigEntry, load_json_object_fixture
18+
from tests.common import MockConfigEntry, async_load_json_object_fixture
1919

2020

2121
@pytest.mark.usefixtures("mock_hunterdouglas_hub")
@@ -330,7 +330,9 @@ async def test_form_unsupported_device(
330330
# Simulate a gen 3 secondary hub
331331
with patch(
332332
"homeassistant.components.hunterdouglas_powerview.util.Hub.request_raw_data",
333-
return_value=load_json_object_fixture("gen3/gateway/secondary.json", DOMAIN),
333+
return_value=await async_load_json_object_fixture(
334+
hass, "gen3/gateway/secondary.json", DOMAIN
335+
),
334336
):
335337
result2 = await hass.config_entries.flow.async_configure(
336338
result["flow_id"],

‎tests/components/nexia/test_switch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ async def test_nexia_sensor_switch(
2929
hass: HomeAssistant, freezer: FrozenDateTimeFactory
3030
) -> None:
3131
"""Test NexiaRoomIQSensorSwitch."""
32-
await async_init_integration(hass, house_fixture="nexia/sensors_xl1050_house.json")
32+
await async_init_integration(hass, house_fixture="sensors_xl1050_house.json")
3333
sw1_id = f"{Platform.SWITCH}.center_nativezone_include_center"
3434
sw1 = {ATTR_ENTITY_ID: sw1_id}
3535
sw2_id = f"{Platform.SWITCH}.center_nativezone_include_upstairs"

‎tests/components/nexia/util.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
1010
from homeassistant.core import HomeAssistant
1111

12-
from tests.common import MockConfigEntry, load_fixture
12+
from tests.common import MockConfigEntry, async_load_fixture
1313
from tests.test_util.aiohttp import mock_aiohttp_client
1414

1515

@@ -18,13 +18,13 @@ async def async_init_integration(
1818
skip_setup: bool = False,
1919
exception: Exception | None = None,
2020
*,
21-
house_fixture="nexia/mobile_houses_123456.json",
21+
house_fixture="mobile_houses_123456.json",
2222
) -> MockConfigEntry:
2323
"""Set up the nexia integration in Home Assistant."""
2424

25-
session_fixture = "nexia/session_123456.json"
26-
sign_in_fixture = "nexia/sign_in.json"
27-
set_fan_speed_fixture = "nexia/set_fan_speed_2293892.json"
25+
session_fixture = "session_123456.json"
26+
sign_in_fixture = "sign_in.json"
27+
set_fan_speed_fixture = "set_fan_speed_2293892.json"
2828
with (
2929
mock_aiohttp_client() as mock_session,
3030
patch("nexia.home.load_or_create_uuid", return_value=uuid.uuid4()),
@@ -40,19 +40,20 @@ async def _raise_exception(*args, **kwargs):
4040
)
4141
else:
4242
mock_session.post(
43-
nexia.API_MOBILE_SESSION_URL, text=load_fixture(session_fixture)
43+
nexia.API_MOBILE_SESSION_URL,
44+
text=await async_load_fixture(hass, session_fixture, DOMAIN),
4445
)
4546
mock_session.get(
4647
nexia.API_MOBILE_HOUSES_URL.format(house_id=123456),
47-
text=load_fixture(house_fixture),
48+
text=await async_load_fixture(hass, house_fixture, DOMAIN),
4849
)
4950
mock_session.post(
5051
nexia.API_MOBILE_ACCOUNTS_SIGN_IN_URL,
51-
text=load_fixture(sign_in_fixture),
52+
text=await async_load_fixture(hass, sign_in_fixture, DOMAIN),
5253
)
5354
mock_session.post(
5455
"https://www.mynexia.com/mobile/xxl_thermostats/2293892/fan_speed",
55-
text=load_fixture(set_fan_speed_fixture),
56+
text=await async_load_fixture(hass, set_fan_speed_fixture, DOMAIN),
5657
)
5758
entry = MockConfigEntry(
5859
domain=DOMAIN,

‎tests/components/nuki/__init__.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
from tests.common import (
1111
MockConfigEntry,
12-
load_json_array_fixture,
13-
load_json_object_fixture,
12+
async_load_json_array_fixture,
13+
async_load_json_object_fixture,
1414
)
1515

1616

@@ -21,15 +21,19 @@ async def init_integration(hass: HomeAssistant) -> MockConfigEntry:
2121
mock.get("http://1.1.1.1:8080/info", json=MOCK_INFO)
2222
mock.get(
2323
"http://1.1.1.1:8080/list",
24-
json=load_json_array_fixture("list.json", DOMAIN),
24+
json=await async_load_json_array_fixture(hass, "list.json", DOMAIN),
2525
)
2626
mock.get(
2727
"http://1.1.1.1:8080/callback/list",
28-
json=load_json_object_fixture("callback_list.json", DOMAIN),
28+
json=await async_load_json_object_fixture(
29+
hass, "callback_list.json", DOMAIN
30+
),
2931
)
3032
mock.get(
3133
"http://1.1.1.1:8080/callback/add",
32-
json=load_json_object_fixture("callback_add.json", DOMAIN),
34+
json=await async_load_json_object_fixture(
35+
hass, "callback_add.json", DOMAIN
36+
),
3337
)
3438
entry = await setup_nuki_integration(hass)
3539
await hass.config_entries.async_setup(entry.entry_id)

‎tests/components/overkiz/test_diagnostics.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from homeassistant.core import HomeAssistant
99
from homeassistant.helpers import device_registry as dr
1010

11-
from tests.common import MockConfigEntry, load_json_object_fixture
11+
from tests.common import MockConfigEntry, async_load_json_object_fixture
1212
from tests.components.diagnostics import (
1313
get_diagnostics_for_config_entry,
1414
get_diagnostics_for_device,
@@ -23,7 +23,9 @@ async def test_diagnostics(
2323
snapshot: SnapshotAssertion,
2424
) -> None:
2525
"""Test diagnostics."""
26-
diagnostic_data = load_json_object_fixture("overkiz/setup_tahoma_switch.json")
26+
diagnostic_data = await async_load_json_object_fixture(
27+
hass, "setup_tahoma_switch.json", DOMAIN
28+
)
2729

2830
with patch.multiple(
2931
"pyoverkiz.client.OverkizClient",
@@ -44,7 +46,9 @@ async def test_device_diagnostics(
4446
snapshot: SnapshotAssertion,
4547
) -> None:
4648
"""Test device diagnostics."""
47-
diagnostic_data = load_json_object_fixture("overkiz/setup_tahoma_switch.json")
49+
diagnostic_data = await async_load_json_object_fixture(
50+
hass, "setup_tahoma_switch.json", DOMAIN
51+
)
4852

4953
device = device_registry.async_get_device(
5054
identifiers={(DOMAIN, "rts://****-****-6867/16756006")}

‎tests/components/switchbot_cloud/test_sensor.py

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

1313
from . import configure_integration
1414

15-
from tests.common import load_json_object_fixture, snapshot_platform
15+
from tests.common import async_load_json_object_fixture, snapshot_platform
1616

1717

1818
async def test_meter(
@@ -33,7 +33,9 @@ async def test_meter(
3333
hubDeviceId="test-hub-id",
3434
),
3535
]
36-
mock_get_status.return_value = load_json_object_fixture("meter_status.json", DOMAIN)
36+
mock_get_status.return_value = await async_load_json_object_fixture(
37+
hass, "meter_status.json", DOMAIN
38+
)
3739

3840
with patch("homeassistant.components.switchbot_cloud.PLATFORMS", [Platform.SENSOR]):
3941
entry = await configure_integration(hass)

‎tests/components/youless/__init__.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
from tests.common import (
1010
MockConfigEntry,
11-
load_json_array_fixture,
12-
load_json_object_fixture,
11+
async_load_json_array_fixture,
12+
async_load_json_object_fixture,
1313
)
1414

1515

@@ -18,16 +18,22 @@ async def init_component(hass: HomeAssistant) -> MockConfigEntry:
1818
with requests_mock.Mocker() as mock:
1919
mock.get(
2020
"http://1.1.1.1/d",
21-
json=load_json_object_fixture("device.json", youless.DOMAIN),
21+
json=await async_load_json_object_fixture(
22+
hass, "device.json", youless.DOMAIN
23+
),
2224
)
2325
mock.get(
2426
"http://1.1.1.1/e",
25-
json=load_json_array_fixture("enologic.json", youless.DOMAIN),
27+
json=await async_load_json_array_fixture(
28+
hass, "enologic.json", youless.DOMAIN
29+
),
2630
headers={"Content-Type": "application/json"},
2731
)
2832
mock.get(
2933
"http://1.1.1.1/f",
30-
json=load_json_object_fixture("phase.json", youless.DOMAIN),
34+
json=await async_load_json_object_fixture(
35+
hass, "phase.json", youless.DOMAIN
36+
),
3137
headers={"Content-Type": "application/json"},
3238
)
3339

0 commit comments

Comments
 (0)
0