From 812bd4af653916521594c7b3f94375d72222b8d9 Mon Sep 17 00:00:00 2001 From: Joost Lekkerkerker Date: Mon, 11 Mar 2024 04:27:00 +0100 Subject: [PATCH] Move metoffice fixture to integration test (#112992) * Move metoffice fixture to integration test * Fix * Update tests/components/metoffice/test_config_flow.py Co-authored-by: Paulus Schoutsen * Fix --------- Co-authored-by: Paulus Schoutsen --- tests/{ => components/metoffice}/fixtures/metoffice.json | 0 tests/components/metoffice/test_config_flow.py | 4 ++-- tests/components/metoffice/test_sensor.py | 4 ++-- tests/components/metoffice/test_weather.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename tests/{ => components/metoffice}/fixtures/metoffice.json (100%) diff --git a/tests/fixtures/metoffice.json b/tests/components/metoffice/fixtures/metoffice.json similarity index 100% rename from tests/fixtures/metoffice.json rename to tests/components/metoffice/fixtures/metoffice.json diff --git a/tests/components/metoffice/test_config_flow.py b/tests/components/metoffice/test_config_flow.py index d5749dad035..e4424b0b394 100644 --- a/tests/components/metoffice/test_config_flow.py +++ b/tests/components/metoffice/test_config_flow.py @@ -26,7 +26,7 @@ async def test_form(hass: HomeAssistant, requests_mock: requests_mock.Mocker) -> hass.config.longitude = TEST_LONGITUDE_WAVERTREE # all metoffice test data encapsulated in here - mock_json = json.loads(load_fixture("metoffice.json")) + mock_json = json.loads(load_fixture("metoffice.json", "metoffice")) all_sites = json.dumps(mock_json["all_sites"]) requests_mock.get("/public/data/val/wxfcs/all/json/sitelist/", text=all_sites) @@ -64,7 +64,7 @@ async def test_form_already_configured( hass.config.longitude = TEST_LONGITUDE_WAVERTREE # all metoffice test data encapsulated in here - mock_json = json.loads(load_fixture("metoffice.json")) + mock_json = json.loads(load_fixture("metoffice.json", "metoffice")) all_sites = json.dumps(mock_json["all_sites"]) diff --git a/tests/components/metoffice/test_sensor.py b/tests/components/metoffice/test_sensor.py index 87d3f66aeb5..6bddd1d2596 100644 --- a/tests/components/metoffice/test_sensor.py +++ b/tests/components/metoffice/test_sensor.py @@ -31,7 +31,7 @@ async def test_one_sensor_site_running( ) -> None: """Test the Met Office sensor platform.""" # all metoffice test data encapsulated in here - mock_json = json.loads(load_fixture("metoffice.json")) + mock_json = json.loads(load_fixture("metoffice.json", "metoffice")) all_sites = json.dumps(mock_json["all_sites"]) wavertree_hourly = json.dumps(mock_json["wavertree_hourly"]) wavertree_daily = json.dumps(mock_json["wavertree_daily"]) @@ -80,7 +80,7 @@ async def test_two_sensor_sites_running( """Test we handle two sets of sensors running for two different sites.""" # all metoffice test data encapsulated in here - mock_json = json.loads(load_fixture("metoffice.json")) + mock_json = json.loads(load_fixture("metoffice.json", "metoffice")) all_sites = json.dumps(mock_json["all_sites"]) wavertree_hourly = json.dumps(mock_json["wavertree_hourly"]) wavertree_daily = json.dumps(mock_json["wavertree_daily"]) diff --git a/tests/components/metoffice/test_weather.py b/tests/components/metoffice/test_weather.py index 85d66bf7686..b0c88063de3 100644 --- a/tests/components/metoffice/test_weather.py +++ b/tests/components/metoffice/test_weather.py @@ -48,7 +48,7 @@ def no_sensor(): async def wavertree_data(requests_mock: requests_mock.Mocker) -> dict[str, _Matcher]: """Mock data for the Wavertree location.""" # all metoffice test data encapsulated in here - mock_json = json.loads(load_fixture("metoffice.json")) + mock_json = json.loads(load_fixture("metoffice.json", "metoffice")) all_sites = json.dumps(mock_json["all_sites"]) wavertree_hourly = json.dumps(mock_json["wavertree_hourly"]) wavertree_daily = json.dumps(mock_json["wavertree_daily"]) @@ -247,7 +247,7 @@ async def test_two_weather_sites_running( ) # all metoffice test data encapsulated in here - mock_json = json.loads(load_fixture("metoffice.json")) + mock_json = json.loads(load_fixture("metoffice.json", "metoffice")) kingslynn_hourly = json.dumps(mock_json["kingslynn_hourly"]) kingslynn_daily = json.dumps(mock_json["kingslynn_daily"])