From f1b400feafc946b5d10753a27b9370f7ea30bd68 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Thu, 21 Apr 2022 10:50:00 -1000 Subject: [PATCH] Revert changes from #70300 part 2 (#70386) --- tests/components/accuweather/test_sensor.py | 4 +++- tests/components/conftest.py | 10 ---------- tests/components/demo/test_water_heater.py | 4 +++- tests/components/gdacs/test_geo_location.py | 4 +++- tests/components/generic_thermostat/test_climate.py | 5 +++-- tests/components/geonetnz_quakes/test_geo_location.py | 4 +++- tests/components/geonetnz_volcano/test_sensor.py | 4 +++- tests/components/mazda/test_sensor.py | 5 ++++- tests/components/subaru/test_sensor.py | 5 ++++- 9 files changed, 26 insertions(+), 19 deletions(-) diff --git a/tests/components/accuweather/test_sensor.py b/tests/components/accuweather/test_sensor.py index 8102605ea0d..a1c454ad0b7 100644 --- a/tests/components/accuweather/test_sensor.py +++ b/tests/components/accuweather/test_sensor.py @@ -30,6 +30,7 @@ from homeassistant.const import ( from homeassistant.helpers import entity_registry as er from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow +from homeassistant.util.unit_system import IMPERIAL_SYSTEM from tests.common import async_fire_time_changed, load_fixture from tests.components.accuweather import init_integration @@ -693,8 +694,9 @@ async def test_manual_update_entity(hass): assert mock_forecast.call_count == 1 -async def test_sensor_imperial_units(hass, units_imperial): +async def test_sensor_imperial_units(hass): """Test states of the sensor without forecast.""" + hass.config.units = IMPERIAL_SYSTEM await init_integration(hass) state = hass.states.get("sensor.home_cloud_ceiling") diff --git a/tests/components/conftest.py b/tests/components/conftest.py index 00609f750fb..f153263cbc6 100644 --- a/tests/components/conftest.py +++ b/tests/components/conftest.py @@ -4,9 +4,6 @@ from unittest.mock import AsyncMock, patch import pytest -from homeassistant.core import HomeAssistant -from homeassistant.util.unit_system import IMPERIAL_SYSTEM - @pytest.fixture(scope="session", autouse=True) def patch_zeroconf_multiple_catcher(): @@ -36,10 +33,3 @@ def entity_registry_enabled_by_default() -> Generator[AsyncMock, None, None]: return_value=True, ) as mock_entity_registry_enabled_by_default: yield mock_entity_registry_enabled_by_default - - -@pytest.fixture -def units_imperial(hass: HomeAssistant) -> Generator[None, None, None]: - """Fixture to temporary change units to imperial.""" - with patch.object(hass.config, "units", IMPERIAL_SYSTEM): - yield diff --git a/tests/components/demo/test_water_heater.py b/tests/components/demo/test_water_heater.py index bcf16346a48..a6b4d999ddb 100644 --- a/tests/components/demo/test_water_heater.py +++ b/tests/components/demo/test_water_heater.py @@ -4,6 +4,7 @@ import voluptuous as vol from homeassistant.components import water_heater from homeassistant.setup import async_setup_component +from homeassistant.util.unit_system import IMPERIAL_SYSTEM from tests.components.water_heater import common @@ -12,8 +13,9 @@ ENTITY_WATER_HEATER_CELSIUS = "water_heater.demo_water_heater_celsius" @pytest.fixture(autouse=True) -async def setup_comp(hass, units_imperial): +async def setup_comp(hass): """Set up demo component.""" + hass.config.units = IMPERIAL_SYSTEM assert await async_setup_component( hass, water_heater.DOMAIN, {"water_heater": {"platform": "demo"}} ) diff --git a/tests/components/gdacs/test_geo_location.py b/tests/components/gdacs/test_geo_location.py index 020bba10545..8fcd5db24a6 100644 --- a/tests/components/gdacs/test_geo_location.py +++ b/tests/components/gdacs/test_geo_location.py @@ -34,6 +34,7 @@ from homeassistant.const import ( from homeassistant.helpers import entity_registry as er from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util +from homeassistant.util.unit_system import IMPERIAL_SYSTEM from tests.common import async_fire_time_changed from tests.components.gdacs import _generate_mock_feed_entry @@ -204,8 +205,9 @@ async def test_setup(hass): assert len(entity_registry.entities) == 1 -async def test_setup_imperial(hass, units_imperial): +async def test_setup_imperial(hass): """Test the setup of the integration using imperial unit system.""" + hass.config.units = IMPERIAL_SYSTEM # Set up some mock feed entries for this test. mock_entry_1 = _generate_mock_feed_entry( "1234", diff --git a/tests/components/generic_thermostat/test_climate.py b/tests/components/generic_thermostat/test_climate.py index 23d2078648e..70337f6f679 100644 --- a/tests/components/generic_thermostat/test_climate.py +++ b/tests/components/generic_thermostat/test_climate.py @@ -39,7 +39,7 @@ from homeassistant.core import DOMAIN as HASS_DOMAIN, CoreState, State, callback from homeassistant.helpers import entity_registry as er from homeassistant.setup import async_setup_component from homeassistant.util import dt as dt_util -from homeassistant.util.unit_system import METRIC_SYSTEM +from homeassistant.util.unit_system import IMPERIAL_SYSTEM, METRIC_SYSTEM from tests.common import ( assert_setup_component, @@ -1201,8 +1201,9 @@ async def setup_comp_9(hass): await hass.async_block_till_done() -async def test_precision(hass, units_imperial, setup_comp_9): +async def test_precision(hass, setup_comp_9): """Test that setting precision to tenths works as intended.""" + hass.config.units = IMPERIAL_SYSTEM await common.async_set_temperature(hass, 23.27) state = hass.states.get(ENTITY) assert state.attributes.get("temperature") == 23.3 diff --git a/tests/components/geonetnz_quakes/test_geo_location.py b/tests/components/geonetnz_quakes/test_geo_location.py index ed2d2d4b1d0..0690da5bf7b 100644 --- a/tests/components/geonetnz_quakes/test_geo_location.py +++ b/tests/components/geonetnz_quakes/test_geo_location.py @@ -28,6 +28,7 @@ from homeassistant.const import ( from homeassistant.helpers import entity_registry as er from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util +from homeassistant.util.unit_system import IMPERIAL_SYSTEM from tests.common import async_fire_time_changed from tests.components.geonetnz_quakes import _generate_mock_feed_entry @@ -167,8 +168,9 @@ async def test_setup(hass): assert len(entity_registry.entities) == 1 -async def test_setup_imperial(hass, units_imperial): +async def test_setup_imperial(hass): """Test the setup of the integration using imperial unit system.""" + hass.config.units = IMPERIAL_SYSTEM # Set up some mock feed entries for this test. mock_entry_1 = _generate_mock_feed_entry("1234", "Title 1", 15.5, (38.0, -3.0)) diff --git a/tests/components/geonetnz_volcano/test_sensor.py b/tests/components/geonetnz_volcano/test_sensor.py index d608c3b2614..d3d2d5dcc2e 100644 --- a/tests/components/geonetnz_volcano/test_sensor.py +++ b/tests/components/geonetnz_volcano/test_sensor.py @@ -23,6 +23,7 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util +from homeassistant.util.unit_system import IMPERIAL_SYSTEM from tests.common import async_fire_time_changed from tests.components.geonetnz_volcano import _generate_mock_feed_entry @@ -146,8 +147,9 @@ async def test_setup(hass): ) -async def test_setup_imperial(hass, units_imperial): +async def test_setup_imperial(hass): """Test the setup of the integration using imperial unit system.""" + hass.config.units = IMPERIAL_SYSTEM # Set up some mock feed entries for this test. mock_entry_1 = _generate_mock_feed_entry("1234", "Title 1", 1, 15.5, (38.0, -3.0)) diff --git a/tests/components/mazda/test_sensor.py b/tests/components/mazda/test_sensor.py index e8762f98adf..f7fb379da51 100644 --- a/tests/components/mazda/test_sensor.py +++ b/tests/components/mazda/test_sensor.py @@ -16,6 +16,7 @@ from homeassistant.const import ( PRESSURE_PSI, ) from homeassistant.helpers import entity_registry as er +from homeassistant.util.unit_system import IMPERIAL_SYSTEM from . import init_integration @@ -125,8 +126,10 @@ async def test_sensors(hass): assert entry.unique_id == "JM000000000000000_rear_right_tire_pressure" -async def test_sensors_imperial_units(hass, units_imperial): +async def test_sensors_imperial_units(hass): """Test that the sensors work properly with imperial units.""" + hass.config.units = IMPERIAL_SYSTEM + await init_integration(hass) # Fuel Distance Remaining diff --git a/tests/components/subaru/test_sensor.py b/tests/components/subaru/test_sensor.py index 145961c0da3..f2a66e7e5e9 100644 --- a/tests/components/subaru/test_sensor.py +++ b/tests/components/subaru/test_sensor.py @@ -10,6 +10,7 @@ from homeassistant.components.subaru.sensor import ( SENSOR_TYPE, ) from homeassistant.util import slugify +from homeassistant.util.unit_system import IMPERIAL_SYSTEM from .api_responses import ( EXPECTED_STATE_EV_IMPERIAL, @@ -29,8 +30,10 @@ from tests.components.subaru.conftest import ( VEHICLE_NAME = VEHICLE_DATA[TEST_VIN_2_EV][VEHICLE_NAME] -async def test_sensors_ev_imperial(hass, ev_entry, units_imperial): +async def test_sensors_ev_imperial(hass, ev_entry): """Test sensors supporting imperial units.""" + hass.config.units = IMPERIAL_SYSTEM + with patch(MOCK_API_FETCH), patch( MOCK_API_GET_DATA, return_value=VEHICLE_STATUS_EV ):