8000 Use async_load_fixture in async test functions (b-i) (#145714) · home-assistant/core@ed9fd2c · GitHub
[go: up one dir, main page]
8000
Skip to content

Commit ed9fd2c

Browse files
epenetepenet
authored
Use async_load_fixture in async test functions (b-i) (#145714)
* Use async_load_fixture in async test functions (b-i) * Adjust
1 parent a007e8d commit ed9fd2c

40 files changed

+240
-169
lines changed

‎tests/components/blueprint/test_importer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import pytest
77
from syrupy.assertion import SnapshotAssertion
88

9-
from homeassistant.components.blueprint import importer
9+
from homeassistant.components.blueprint import DOMAIN, importer
1010
from homeassistant.core import HomeAssistant
1111
from homeassistant.exceptions import HomeAssistantError
1212

13-
from tests.common import load_fixture
13+
from tests.common import async_load_fixture, load_fixture
1414
from tests.test_util.aiohttp import AiohttpClientMocker
1515

1616

@@ -161,7 +161,7 @@ async def test_fetch_blueprint_from_github_gist_url(
161161
"""Test fetching blueprint from url."""
162162
aioclient_mock.get(
163163
"https://api.github.com/gists/e717ce85dd0d2f1bdcdfc884ea25a344",
164-
text=load_fixture("blueprint/github_gist.json"),
164+
text=await async_load_fixture(hass, "github_gist.json", DOMAIN),
165165
)
166166

167167
url = "https://gist.github.com/balloob/e717ce85dd0d2f1bdcdfc884ea25a344"

‎tests/components/bluetooth/test_base_scanner.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
patch_bluetooth_time,
4242
)
4343

44-
from tests.common import MockConfigEntry, async_fire_time_changed, load_fixture
44+
from tests.common import MockConfigEntry, async_fire_time_changed, async_load_fixture
4545

4646

4747
@pytest.mark.parametrize("name_2", [None, "w"])
@@ -313,7 +313,7 @@ async def test_restore_history_remote_adapter(
313313
"""Test we can restore history for a remote adapter."""
314314

315315
data = hass_storage[storage.REMOTE_SCANNER_STORAGE_KEY] = json_loads(
316-
load_fixture("bluetooth.remote_scanners", bluetooth.DOMAIN)
316+
await async_load_fixture(hass, "bluetooth.remote_scanners", bluetooth.DOMAIN)
317317
)
318318
now = time.time()
319319
timestamps = data["data"]["atom-bluetooth-proxy-ceaac4"][

‎tests/components/bluetooth/test_manager.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
MockModule,
6464
async_call_logger_set_level,
6565
async_fire_time_changed,
66-
load_fixture,
66+
async_load_fixture,
6767
mock_integration,
6868
)
6969

@@ -453,7 +453,7 @@ async def test_restore_history_from_dbus_and_remote_adapters(
453453
address = "AA:BB:CC:CC:CC:FF"
454454

455455
data = hass_storage[storage.REMOTE_SCANNER_STORAGE_KEY] = json_loads(
456-
load_fixture("bluetooth.remote_scanners", bluetooth.DOMAIN)
456+
await async_load_fixture(hass, "bluetooth.remote_scanners", bluetooth.DOMAIN)
457457
)
458458
now = time.time()
459459
timestamps = data["data"]["atom-bluetooth-proxy-ceaac4"][
@@ -495,7 +495,9 @@ async def test_restore_history_from_dbus_and_corrupted_remote_adapters(
495495
address = "AA:BB:CC:CC:CC:FF"
496496

497497
data = hass_storage[storage.REMOTE_SCANNER_STORAGE_KEY] = json_loads(
498-
load_fixture("bluetooth.remote_scanners.corrupt", bluetooth.DOMAIN)
498+
await async_load_fixture(
499+
hass, "bluetooth.remote_scanners.corrupt", bluetooth.DOMAIN
500+
)
499501
)
500502
now = time.time()
501503
timestamps = data["data"]["atom-bluetooth-proxy-ceaac4"][

‎tests/components/bring/test_diagnostics.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from homeassistant.components.bring.const import DOMAIN
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.components.diagnostics import get_diagnostics_for_config_entry
1414
from tests.typing import ClientSessionGenerator
1515

@@ -24,8 +24,12 @@ async def test_diagnostics(
2424
) -> None:
2525
"""Test diagnostics."""
2626
mock_bring_client.get_list.side_effect = [
27-
BringItemsResponse.from_json(load_fixture("items.json", DOMAIN)),
28-
BringItemsResponse.from_json(load_fixture("items2.json", DOMAIN)),
27+
BringItemsResponse.from_json(
28+
await async_load_fixture(hass, "items.json", DOMAIN)
29+
),
30+
BringItemsResponse.from_json(
31+
await async_load_fixture(hass, "items2.json", DOMAIN)
32+
),
2933
]
3034
bring_config_entry.add_to_hass(hass)
3135
await hass.config_entries.async_setup(bring_config_entry.entry_id)

‎tests/components/bring/test_init.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
from .conftest import UUID
2323

24-
from tests.common import MockConfigEntry, async_fire_time_changed, load_fixture
24+
from tests.common import MockConfigEntry, async_fire_time_changed, async_load_fixture
2525

2626

2727
async def setup_integration(
@@ -240,7 +240,7 @@ async def test_purge_devices(
240240
)
241241

242242
mock_bring_client.load_lists.return_value = BringListResponse.from_json(
243-
load_fixture("lists2.json", DOMAIN)
243+
await async_load_fixture(hass, "lists2.json", DOMAIN)
244244
)
245245

246246
freezer.tick(timedelta(seconds=90))
@@ -265,7 +265,7 @@ async def test_create_devices(
265265
"""Test create device entry for new lists."""
266266
list_uuid = "b4776778-7f6c-496e-951b-92a35d3db0dd"
267267
mock_bring_client.load_lists.return_value = BringListResponse.from_json(
268-
load_fixture("lists2.json", DOMAIN)
268+
await async_load_fixture(hass, "lists2.json", DOMAIN)
269269
)
270270
await setup_integration(hass, bring_config_entry)
271271

@@ -279,7 +279,7 @@ async def test_create_devices(
279279
)
280280

281281
mock_bring_client.load_lists.return_value = BringListResponse.from_json(
282-
load_fixture("lists.json", DOMAIN)
282+
await async_load_fixture(hass, "lists.json", DOMAIN)
283283
)
284284
freezer.tick(timedelta(seconds=90))
285285
async_fire_time_changed(hass)
@@ -310,7 +310,7 @@ async def test_coordinator_update_intervals(
310310
mock_bring_client.get_activity.reset_mock()
311311

312312
mock_bring_client.load_lists.return_value = BringListResponse.from_json(
313-
load_fixture("lists2.json", DOMAIN)
313+
await async_load_fixture(hass, "lists2.json", DOMAIN)
314314
)
315315
freezer.tick(timedelta(seconds=90))
316316
async_fire_time_changed(hass)

‎tests/components/bring/test_sensor.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from homeassistant.core import HomeAssistant
1414
from homeassistant.helpers import entity_registry as er
1515

16-
from tests.common import MockConfigEntry, load_fixture, snapshot_platform
16+
from tests.common import MockConfigEntry, async_load_fixture, snapshot_platform
1717

1818

1919
@pytest.fixture(autouse=True)
@@ -36,8 +36,12 @@ async def test_setup(
3636
"""Snapshot test states of sensor platform."""
3737

3838
mock_bring_client.get_list.side_effect = [
39-
BringItemsResponse.from_json(load_fixture("items.json", DOMAIN)),
40-
BringItemsResponse.from_json(load_fixture("items2.json", DOMAIN)),
39+
BringItemsResponse.from_json(
40+
await async_load_fixture(hass, "items.json", DOMAIN)
41+
),
42+
BringItemsResponse.from_json(
43+
await async_load_fixture(hass, "items2.json", DOMAIN)
44+
),
4145
]
4246
bring_config_entry.add_to_hass(hass)
4347
await hass.config_entries.async_setup(bring_config_entry.entry_id)
@@ -68,7 +72,7 @@ async def test_list_access_states(
6872
"""Snapshot test states of list access sensor."""
6973

7074
mock_bring_client.get_list.return_value = BringItemsResponse.from_json(
71-
load_fixture(f"{fixture}.json", DOMAIN)
75+
await async_load_fixture(hass, f"{fixture}.json", DOMAIN)
7276
)
7377
bring_config_entry.add_to_hass(hass)
7478
await hass.config_entries.async_setup(bring_config_entry.entry_id)

‎tests/components/bring/test_todo.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from homeassistant.exceptions import HomeAssistantError
2323
from homeassistant.helpers import entity_registry as er
2424

25-
from tests.common import MockConfigEntry, load_fixture, snapshot_platform
25+
from tests.common import MockConfigEntry, async_load_fixture, snapshot_platform
2626

2727

2828
@pytest.fixture(autouse=True)
@@ -45,8 +45,12 @@ async def test_todo(
4545
) -> None:
4646
"""Snapshot test states of todo platform."""
4747
mock_bring_client.get_list.side_effect = [
48-
BringItemsResponse.from_json(load_fixture("items.json", DOMAIN)),
49-
BringItemsResponse.from_json(load_fixture("items2.json", DOMAIN)),
48+
BringItemsResponse.from_json(
49+
await async_load_fixture(hass, "items.json", DOMAIN)
50+
),
51+
BringItemsResponse.from_json(
52+
await async_load_fixture(hass, "items2.json", DOMAIN)
53+
),
5054
]
5155
bring_config_entry.add_to_hass(hass)
5256
await hass.config_entries.async_setup(bring_config_entry.entry_id)

‎tests/components/cast/test_helpers.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from aiohttp import client_exceptions
44
import pytest
55

6+
from homeassistant.components.cast.const import DOMAIN
67
from homeassistant.components.cast.helpers import (
78
PlaylistError,
89
PlaylistItem,
@@ -11,7 +12,7 @@
1112
)
1213
from homeassistant.core import HomeAssistant
1314

14-
from tests.common import load_fixture
15+
from tests.common import async_load_fixture
1516
from tests.test_util.aiohttp import AiohttpClientMocker
1617

1718

@@ -40,7 +41,9 @@ async def test_hls_playlist_supported(
4041
) -> None:
4142
"""Test playlist parsing of HLS playlist."""
4243
headers = {"content-type": content_type}
43-
aioclient_mock.get(url, text=load_fixture(fixture, "cast"), headers=headers)
44+
aioclient_mock.get(
45+
url, text=await async_load_fixture(hass, fixture, DOMAIN), headers=headers
46+
)
4447
with pytest.raises(PlaylistSupported):
4548
await parse_playlist(hass, url)
4649

@@ -108,7 +111,9 @@ async def test_parse_playlist(
108111
) -> None:
109112
"""Test playlist parsing of HLS playlist."""
110113
headers = {"content-type": content_type}
111-
aioclient_mock.get(url, text=load_fixture(fixture, "cast"), headers=headers)
114+
aioclient_mock.get(
115+
url, text=await async_load_fixture(hass, fixture, DOMAIN), headers=headers
116+
)
112117
playlist = await parse_playlist(hass, url)
113118
assert expected_playlist == playlist
114119

@@ -132,7 +137,7 @@ async def test_parse_bad_playlist(
132137
hass: HomeAssistant, aioclient_mock: AiohttpClientMocker, url, fixture
133138
) -> None:
134139
"""Test playlist parsing of HLS playlist."""
135-
aioclient_mock.get(url, text=load_fixture(fixture, "cast"))
140+
aioclient_mock.get(url, text=await async_load_fixture(hass, fixture, DOMAIN))
136141
with pytest.raises(PlaylistError):
137142
await parse_playlist(hass, url)
138143

‎tests/components/cast/test_media_player.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from homeassistant.components import media_player, tts
1919
from homeassistant.components.cast import media_player as cast
2020
from homeassistant.components.cast.const import (
21+
DOMAIN,
2122
SIGNAL_HASS_CAST_SHOW_VIEW,
2223
HomeAssistantControllerData,
2324
)
@@ -45,7 +46,7 @@
4546
from tests.common import (
4647
MockConfigEntry,
4748
assert_setup_component,
48-
load_fixture,
49+
async_load_fixture,
4950
mock_platform,
5051
)
5152
from tests.components.media_player import common
@@ -1348,7 +1349,7 @@ async def test_entity_play_media_playlist(
13481349
) -> None:
13491350
"""Test playing media."""
13501351
entity_id = "media_player.speaker"
1351-
aioclient_mock.get(url, text=load_fixture(fixture, "cast"))
1352+
aioclient_mock.get(url, text=await async_load_fixture(hass, fixture, DOMAIN))
13521353

13531354
await async_process_ha_core_config(
13541355
hass,

‎tests/components/color_extractor/test_service.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from homeassistant.setup import async_setup_component
2828
from homeassistant.util import color as color_util
2929

30-
from tests.common import load_fixture
30+
from tests.common import async_load_fixture, load_fixture
3131
from tests.test_util.aiohttp import AiohttpClientMocker
3232

3333
LIGHT_ENTITY = "light.kitchen_lights"
@@ -145,7 +145,7 @@ async def test_url_success(
145145
aioclient_mock.get(
146146
url=service_data[ATTR_URL],
147147
content=base64.b64decode(
148-
load_fixture("color_extractor/color_extractor_url.txt")
148+
await async_load_fixture(hass, "color_extractor_url.txt", DOMAIN)
149149
),
150150
)
151151

@@ -233,9 +233,7 @@ async def test_url_error(
233233
@patch(
234234
"builtins.open",
235235
mock_open(
236-
read_data=base64.b64decode(
237-
load_fixture("color_extractor/color_extractor_file.txt")
238-
)
236+
read_data=base64.b64decode(load_fixture("color_extractor_file.txt", DOMAIN))
239237
),
240238
create=True,
241239
)

0 commit comments

Comments
 (0)
0