From 8a1d80c60933f07c8325bcc37ac51a3c6dd37d5b Mon Sep 17 00:00:00 2001 From: Marvin Wichmann Date: Fri, 5 Nov 2021 21:10:55 +0100 Subject: [PATCH] Fix regression after merging fixtures with old path (#59187) * Fix regression after merging old fixtures * Move to symo --- .../fronius/fixtures}/symo/GetAPIVersion.json | 0 .../fronius/fixtures}/symo/GetInverterInfo.json | 0 .../GetInverterRealtimeDate_Device_1_day.json | 0 .../GetInverterRealtimeDate_Device_1_night.json | 0 .../fronius/fixtures}/symo/GetLoggerInfo.json | 0 .../symo/GetMeterRealtimeData_Device_0.json | 0 .../symo/GetMeterRealtimeData_System.json | 0 .../symo/GetPowerFlowRealtimeData_day.json | 0 .../symo/GetPowerFlowRealtimeData_night.json | 0 .../symo/GetStorageRealtimeData_System.json | 0 tests/components/fronius/test_sensor.py | 16 ++++++++-------- 11 files changed, 8 insertions(+), 8 deletions(-) rename tests/{fixtures/fronius => components/fronius/fixtures}/symo/GetAPIVersion.json (100%) rename tests/{fixtures/fronius => components/fronius/fixtures}/symo/GetInverterInfo.json (100%) rename tests/{fixtures/fronius => components/fronius/fixtures}/symo/GetInverterRealtimeDate_Device_1_day.json (100%) rename tests/{fixtures/fronius => components/fronius/fixtures}/symo/GetInverterRealtimeDate_Device_1_night.json (100%) rename tests/{fixtures/fronius => components/fronius/fixtures}/symo/GetLoggerInfo.json (100%) rename tests/{fixtures/fronius => components/fronius/fixtures}/symo/GetMeterRealtimeData_Device_0.json (100%) rename tests/{fixtures/fronius => components/fronius/fixtures}/symo/GetMeterRealtimeData_System.json (100%) rename tests/{fixtures/fronius => components/fronius/fixtures}/symo/GetPowerFlowRealtimeData_day.json (100%) rename tests/{fixtures/fronius => components/fronius/fixtures}/symo/GetPowerFlowRealtimeData_night.json (100%) rename tests/{fixtures/fronius => components/fronius/fixtures}/symo/GetStorageRealtimeData_System.json (100%) diff --git a/tests/fixtures/fronius/symo/GetAPIVersion.json b/tests/components/fronius/fixtures/symo/GetAPIVersion.json similarity index 100% rename from tests/fixtures/fronius/symo/GetAPIVersion.json rename to tests/components/fronius/fixtures/symo/GetAPIVersion.json diff --git a/tests/fixtures/fronius/symo/GetInverterInfo.json b/tests/components/fronius/fixtures/symo/GetInverterInfo.json similarity index 100% rename from tests/fixtures/fronius/symo/GetInverterInfo.json rename to tests/components/fronius/fixtures/symo/GetInverterInfo.json diff --git a/tests/fixtures/fronius/symo/GetInverterRealtimeDate_Device_1_day.json b/tests/components/fronius/fixtures/symo/GetInverterRealtimeDate_Device_1_day.json similarity index 100% rename from tests/fixtures/fronius/symo/GetInverterRealtimeDate_Device_1_day.json rename to tests/components/fronius/fixtures/symo/GetInverterRealtimeDate_Device_1_day.json diff --git a/tests/fixtures/fronius/symo/GetInverterRealtimeDate_Device_1_night.json b/tests/components/fronius/fixtures/symo/GetInverterRealtimeDate_Device_1_night.json similarity index 100% rename from tests/fixtures/fronius/symo/GetInverterRealtimeDate_Device_1_night.json rename to tests/components/fronius/fixtures/symo/GetInverterRealtimeDate_Device_1_night.json diff --git a/tests/fixtures/fronius/symo/GetLoggerInfo.json b/tests/components/fronius/fixtures/symo/GetLoggerInfo.json similarity index 100% rename from tests/fixtures/fronius/symo/GetLoggerInfo.json rename to tests/components/fronius/fixtures/symo/GetLoggerInfo.json diff --git a/tests/fixtures/fronius/symo/GetMeterRealtimeData_Device_0.json b/tests/components/fronius/fixtures/symo/GetMeterRealtimeData_Device_0.json similarity index 100% rename from tests/fixtures/fronius/symo/GetMeterRealtimeData_Device_0.json rename to tests/components/fronius/fixtures/symo/GetMeterRealtimeData_Device_0.json diff --git a/tests/fixtures/fronius/symo/GetMeterRealtimeData_System.json b/tests/components/fronius/fixtures/symo/GetMeterRealtimeData_System.json similarity index 100% rename from tests/fixtures/fronius/symo/GetMeterRealtimeData_System.json rename to tests/components/fronius/fixtures/symo/GetMeterRealtimeData_System.json diff --git a/tests/fixtures/fronius/symo/GetPowerFlowRealtimeData_day.json b/tests/components/fronius/fixtures/symo/GetPowerFlowRealtimeData_day.json similarity index 100% rename from tests/fixtures/fronius/symo/GetPowerFlowRealtimeData_day.json rename to tests/components/fronius/fixtures/symo/GetPowerFlowRealtimeData_day.json diff --git a/tests/fixtures/fronius/symo/GetPowerFlowRealtimeData_night.json b/tests/components/fronius/fixtures/symo/GetPowerFlowRealtimeData_night.json similarity index 100% rename from tests/fixtures/fronius/symo/GetPowerFlowRealtimeData_night.json rename to tests/components/fronius/fixtures/symo/GetPowerFlowRealtimeData_night.json diff --git a/tests/fixtures/fronius/symo/GetStorageRealtimeData_System.json b/tests/components/fronius/fixtures/symo/GetStorageRealtimeData_System.json similarity index 100% rename from tests/fixtures/fronius/symo/GetStorageRealtimeData_System.json rename to tests/components/fronius/fixtures/symo/GetStorageRealtimeData_System.json diff --git a/tests/components/fronius/test_sensor.py b/tests/components/fronius/test_sensor.py index b5617fad03c..4564d26fa9f 100644 --- a/tests/components/fronius/test_sensor.py +++ b/tests/components/fronius/test_sensor.py @@ -26,40 +26,40 @@ def mock_responses(aioclient_mock: AiohttpClientMocker, night: bool = False) -> aioclient_mock.get( f"{MOCK_HOST}/solar_api/GetAPIVersion.cgi", - text=load_fixture("fronius/symo/GetAPIVersion.json"), + text=load_fixture("symo/GetAPIVersion.json", "fronius"), ) aioclient_mock.get( f"{MOCK_HOST}/solar_api/v1/GetInverterRealtimeData.cgi?Scope=Device&" "DeviceId=1&DataCollection=CommonInverterData", text=load_fixture( - f"fronius/symo/GetInverterRealtimeDate_Device_1_{_day_or_night}.json" + f"symo/GetInverterRealtimeDate_Device_1_{_day_or_night}.json", "fronius" ), ) aioclient_mock.get( f"{MOCK_HOST}/solar_api/v1/GetInverterInfo.cgi", - text=load_fixture("fronius/symo/GetInverterInfo.json"), + text=load_fixture("symo/GetInverterInfo.json", "fronius"), ) aioclient_mock.get( f"{MOCK_HOST}/solar_api/v1/GetLoggerInfo.cgi", - text=load_fixture("fronius/symo/GetLoggerInfo.json"), + text=load_fixture("symo/GetLoggerInfo.json", "fronius"), ) aioclient_mock.get( f"{MOCK_HOST}/solar_api/v1/GetMeterRealtimeData.cgi?Scope=Device&DeviceId=0", - text=load_fixture("fronius/symo/GetMeterRealtimeData_Device_0.json"), + text=load_fixture("symo/GetMeterRealtimeData_Device_0.json", "fronius"), ) aioclient_mock.get( f"{MOCK_HOST}/solar_api/v1/GetMeterRealtimeData.cgi?Scope=System", - text=load_fixture("fronius/symo/GetMeterRealtimeData_System.json"), + text=load_fixture("symo/GetMeterRealtimeData_System.json", "fronius"), ) aioclient_mock.get( f"{MOCK_HOST}/solar_api/v1/GetPowerFlowRealtimeData.fcgi", text=load_fixture( - f"fronius/symo/GetPowerFlowRealtimeData_{_day_or_night}.json" + f"symo/GetPowerFlowRealtimeData_{_day_or_night}.json", "fronius" ), ) aioclient_mock.get( f"{MOCK_HOST}/solar_api/v1/GetStorageRealtimeData.cgi?Scope=System", - text=load_fixture("fronius/symo/GetStorageRealtimeData_System.json"), + text=load_fixture("symo/GetStorageRealtimeData_System.json", "fronius"), )