diff --git a/requirements_test.txt b/requirements_test.txt index f9bf5c679d5..3bd4ff8c479 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -4,7 +4,6 @@ -c homeassistant/package_constraints.txt -r requirements_test_pre_commit.txt -asynctest==0.13.0 codecov==2.1.10 coverage==5.3 jsonpickle==1.4.1 diff --git a/script/scaffold/templates/config_flow/tests/test_config_flow.py b/script/scaffold/templates/config_flow/tests/test_config_flow.py index a69bea2abd8..04eab6e683c 100644 --- a/script/scaffold/templates/config_flow/tests/test_config_flow.py +++ b/script/scaffold/templates/config_flow/tests/test_config_flow.py @@ -1,10 +1,10 @@ """Test the NEW_NAME config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, setup from homeassistant.components.NEW_DOMAIN.config_flow import CannotConnect, InvalidAuth from homeassistant.components.NEW_DOMAIN.const import DOMAIN -from tests.async_mock import patch - async def test_form(hass): """Test we get the form.""" diff --git a/script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py b/script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py index ed974601646..dd0fc3446b3 100644 --- a/script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py +++ b/script/scaffold/templates/config_flow_oauth2/tests/test_config_flow.py @@ -1,4 +1,6 @@ """Test the NEW_NAME config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, setup from homeassistant.components.NEW_DOMAIN.const import ( DOMAIN, @@ -7,8 +9,6 @@ from homeassistant.components.NEW_DOMAIN.const import ( ) from homeassistant.helpers import config_entry_oauth2_flow -from tests.async_mock import patch - CLIENT_ID = "1234" CLIENT_SECRET = "5678" diff --git a/tests/async_mock.py b/tests/async_mock.py deleted file mode 100644 index 8257ddd3b3b..00000000000 --- a/tests/async_mock.py +++ /dev/null @@ -1,9 +0,0 @@ -"""Mock utilities that are async aware.""" -import sys - -if sys.version_info[:2] < (3, 8): - from asynctest.mock import * # noqa - - AsyncMock = CoroutineMock # noqa: F405 -else: - from unittest.mock import * # noqa diff --git a/tests/auth/mfa_modules/test_notify.py b/tests/auth/mfa_modules/test_notify.py index 65ee5d5d0c5..c79d76baf4f 100644 --- a/tests/auth/mfa_modules/test_notify.py +++ b/tests/auth/mfa_modules/test_notify.py @@ -1,12 +1,12 @@ """Test the HMAC-based One Time Password (MFA) auth module.""" import asyncio +from unittest.mock import patch from homeassistant import data_entry_flow from homeassistant.auth import auth_manager_from_config, models as auth_models from homeassistant.auth.mfa_modules import auth_mfa_module_from_config from homeassistant.components.notify import NOTIFY_SERVICE_SCHEMA -from tests.async_mock import patch from tests.common import MockUser, async_mock_service MOCK_CODE = "123456" diff --git a/tests/auth/mfa_modules/test_totp.py b/tests/auth/mfa_modules/test_totp.py index b14b20297eb..d0a4f3cf3ac 100644 --- a/tests/auth/mfa_modules/test_totp.py +++ b/tests/auth/mfa_modules/test_totp.py @@ -1,11 +1,11 @@ """Test the Time-based One Time Password (MFA) auth module.""" import asyncio +from unittest.mock import patch from homeassistant import data_entry_flow from homeassistant.auth import auth_manager_from_config, models as auth_models from homeassistant.auth.mfa_modules import auth_mfa_module_from_config -from tests.async_mock import patch from tests.common import MockUser MOCK_CODE = "123456" diff --git a/tests/auth/providers/test_command_line.py b/tests/auth/providers/test_command_line.py index 3915950cedb..e437ca9e331 100644 --- a/tests/auth/providers/test_command_line.py +++ b/tests/auth/providers/test_command_line.py @@ -1,6 +1,7 @@ """Tests for the command_line auth provider.""" import os +from unittest.mock import AsyncMock import uuid import pytest @@ -10,8 +11,6 @@ from homeassistant.auth import AuthManager, auth_store, models as auth_models from homeassistant.auth.providers import command_line from homeassistant.const import CONF_TYPE -from tests.async_mock import AsyncMock - @pytest.fixture def store(hass): diff --git a/tests/auth/providers/test_homeassistant.py b/tests/auth/providers/test_homeassistant.py index c804b237e8b..62093df7210 100644 --- a/tests/auth/providers/test_homeassistant.py +++ b/tests/auth/providers/test_homeassistant.py @@ -1,5 +1,6 @@ """Test the Home Assistant local auth provider.""" import asyncio +from unittest.mock import Mock, patch import pytest import voluptuous as vol @@ -11,8 +12,6 @@ from homeassistant.auth.providers import ( homeassistant as hass_auth, ) -from tests.async_mock import Mock, patch - @pytest.fixture def data(hass): diff --git a/tests/auth/providers/test_insecure_example.py b/tests/auth/providers/test_insecure_example.py index c2b16cbafab..235f9a4735f 100644 --- a/tests/auth/providers/test_insecure_example.py +++ b/tests/auth/providers/test_insecure_example.py @@ -1,4 +1,5 @@ """Tests for the insecure example auth provider.""" +from unittest.mock import AsyncMock import uuid import pytest @@ -6,8 +7,6 @@ import pytest from homeassistant.auth import AuthManager, auth_store, models as auth_models from homeassistant.auth.providers import insecure_example -from tests.async_mock import AsyncMock - @pytest.fixture def store(hass): diff --git a/tests/auth/test_auth_store.py b/tests/auth/test_auth_store.py index 78ab9829ab6..4ab0fc4a360 100644 --- a/tests/auth/test_auth_store.py +++ b/tests/auth/test_auth_store.py @@ -1,10 +1,9 @@ """Tests for the auth store.""" import asyncio +from unittest.mock import patch from homeassistant.auth import auth_store -from tests.async_mock import patch - async def test_loading_no_group_data_format(hass, hass_storage): """Test we correctly load old data without any groups.""" diff --git a/tests/auth/test_init.py b/tests/auth/test_init.py index f303a59179b..edcd01d51e1 100644 --- a/tests/auth/test_init.py +++ b/tests/auth/test_init.py @@ -1,5 +1,6 @@ """Tests for the Home Assistant auth module.""" from datetime import timedelta +from unittest.mock import Mock, patch import jwt import pytest @@ -11,7 +12,6 @@ from homeassistant.auth.const import MFA_SESSION_EXPIRATION from homeassistant.core import callback from homeassistant.util import dt as dt_util -from tests.async_mock import Mock, patch from tests.common import CLIENT_ID, MockUser, ensure_auth_manager_loaded, flush_store diff --git a/tests/common.py b/tests/common.py index ce07f5ab615..2621f2f4b15 100644 --- a/tests/common.py +++ b/tests/common.py @@ -12,6 +12,7 @@ import os import pathlib import threading import time +from unittest.mock import AsyncMock, Mock, patch import uuid from aiohttp.test_utils import unused_port as get_test_instance_port # noqa @@ -60,8 +61,6 @@ import homeassistant.util.dt as date_util from homeassistant.util.unit_system import METRIC_SYSTEM import homeassistant.util.yaml.loader as yaml_loader -from tests.async_mock import AsyncMock, Mock, patch - _LOGGER = logging.getLogger(__name__) INSTANCES = [] CLIENT_ID = "https://example.com/app" diff --git a/tests/components/abode/common.py b/tests/components/abode/common.py index 157a5441bb1..aabc732daa2 100644 --- a/tests/components/abode/common.py +++ b/tests/components/abode/common.py @@ -1,9 +1,10 @@ """Common methods used across tests for Abode.""" +from unittest.mock import patch + from homeassistant.components.abode import DOMAIN as ABODE_DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_USERNAME from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/abode/test_alarm_control_panel.py b/tests/components/abode/test_alarm_control_panel.py index b45599c408e..63ae20441f5 100644 --- a/tests/components/abode/test_alarm_control_panel.py +++ b/tests/components/abode/test_alarm_control_panel.py @@ -1,4 +1,6 @@ """Tests for the Abode alarm control panel device.""" +from unittest.mock import PropertyMock, patch + import abodepy.helpers.constants as CONST from homeassistant.components.abode import ATTR_DEVICE_ID @@ -17,8 +19,6 @@ from homeassistant.const import ( from .common import setup_platform -from tests.async_mock import PropertyMock, patch - DEVICE_ID = "alarm_control_panel.abode_alarm" diff --git a/tests/components/abode/test_camera.py b/tests/components/abode/test_camera.py index 9db03d90222..06540955464 100644 --- a/tests/components/abode/test_camera.py +++ b/tests/components/abode/test_camera.py @@ -1,12 +1,12 @@ """Tests for the Abode camera device.""" +from unittest.mock import patch + from homeassistant.components.abode.const import DOMAIN as ABODE_DOMAIN from homeassistant.components.camera import DOMAIN as CAMERA_DOMAIN from homeassistant.const import ATTR_ENTITY_ID, STATE_IDLE from .common import setup_platform -from tests.async_mock import patch - async def test_entity_registry(hass): """Tests that the devices are registered in the entity registry.""" diff --git a/tests/components/abode/test_config_flow.py b/tests/components/abode/test_config_flow.py index f1445db340f..026735ed536 100644 --- a/tests/components/abode/test_config_flow.py +++ b/tests/components/abode/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for the Abode config flow.""" +from unittest.mock import patch + from abodepy.exceptions import AbodeAuthenticationException from abodepy.helpers.errors import MFA_CODE_REQUIRED @@ -13,7 +15,6 @@ from homeassistant.const import ( HTTP_INTERNAL_SERVER_ERROR, ) -from tests.async_mock import patch from tests.common import MockConfigEntry CONF_POLLING = "polling" diff --git a/tests/components/abode/test_cover.py b/tests/components/abode/test_cover.py index b166ec5464a..bb1b8fceffb 100644 --- a/tests/components/abode/test_cover.py +++ b/tests/components/abode/test_cover.py @@ -1,4 +1,6 @@ """Tests for the Abode cover device.""" +from unittest.mock import patch + from homeassistant.components.abode import ATTR_DEVICE_ID from homeassistant.components.cover import DOMAIN as COVER_DOMAIN from homeassistant.const import ( @@ -11,8 +13,6 @@ from homeassistant.const import ( from .common import setup_platform -from tests.async_mock import patch - DEVICE_ID = "cover.garage_door" diff --git a/tests/components/abode/test_init.py b/tests/components/abode/test_init.py index 68f7ce9dd03..b4f3dbd736b 100644 --- a/tests/components/abode/test_init.py +++ b/tests/components/abode/test_init.py @@ -1,4 +1,6 @@ """Tests for the Abode module.""" +from unittest.mock import patch + from abodepy.exceptions import AbodeAuthenticationException from homeassistant.components.abode import ( @@ -12,8 +14,6 @@ from homeassistant.const import CONF_USERNAME, HTTP_BAD_REQUEST from .common import setup_platform -from tests.async_mock import patch - async def test_change_settings(hass): """Test change_setting service.""" diff --git a/tests/components/abode/test_light.py b/tests/components/abode/test_light.py index 6506746783c..f0eee4b209b 100644 --- a/tests/components/abode/test_light.py +++ b/tests/components/abode/test_light.py @@ -1,4 +1,6 @@ """Tests for the Abode light device.""" +from unittest.mock import patch + from homeassistant.components.abode import ATTR_DEVICE_ID from homeassistant.components.light import ( ATTR_BRIGHTNESS, @@ -17,8 +19,6 @@ from homeassistant.const import ( from .common import setup_platform -from tests.async_mock import patch - DEVICE_ID = "light.living_room_lamp" diff --git a/tests/components/abode/test_lock.py b/tests/components/abode/test_lock.py index 6850eebe0ce..45e17861d33 100644 --- a/tests/components/abode/test_lock.py +++ b/tests/components/abode/test_lock.py @@ -1,4 +1,6 @@ """Tests for the Abode lock device.""" +from unittest.mock import patch + from homeassistant.components.abode import ATTR_DEVICE_ID from homeassistant.components.lock import DOMAIN as LOCK_DOMAIN from homeassistant.const import ( @@ -11,8 +13,6 @@ from homeassistant.const import ( from .common import setup_platform -from tests.async_mock import patch - DEVICE_ID = "lock.test_lock" diff --git a/tests/components/abode/test_switch.py b/tests/components/abode/test_switch.py index 5c480b33225..3ec9648d87d 100644 --- a/tests/components/abode/test_switch.py +++ b/tests/components/abode/test_switch.py @@ -1,4 +1,6 @@ """Tests for the Abode switch device.""" +from unittest.mock import patch + from homeassistant.components.abode import ( DOMAIN as ABODE_DOMAIN, SERVICE_TRIGGER_AUTOMATION, @@ -14,8 +16,6 @@ from homeassistant.const import ( from .common import setup_platform -from tests.async_mock import patch - AUTOMATION_ID = "switch.test_automation" AUTOMATION_UID = "47fae27488f74f55b964a81a066c3a01" DEVICE_ID = "switch.test_switch" diff --git a/tests/components/accuweather/__init__.py b/tests/components/accuweather/__init__.py index 28e53d1e2fc..d78eac4269b 100644 --- a/tests/components/accuweather/__init__.py +++ b/tests/components/accuweather/__init__.py @@ -1,9 +1,9 @@ """Tests for AccuWeather.""" import json +from unittest.mock import patch from homeassistant.components.accuweather.const import DOMAIN -from tests.async_mock import patch from tests.common import MockConfigEntry, load_fixture diff --git a/tests/components/accuweather/test_config_flow.py b/tests/components/accuweather/test_config_flow.py index 89159d7c1bf..1d9feecda3c 100644 --- a/tests/components/accuweather/test_config_flow.py +++ b/tests/components/accuweather/test_config_flow.py @@ -1,5 +1,6 @@ """Define tests for the AccuWeather config flow.""" import json +from unittest.mock import patch from accuweather import ApiError, InvalidApiKeyError, RequestsExceededError @@ -8,7 +9,6 @@ from homeassistant.components.accuweather.const import CONF_FORECAST, DOMAIN from homeassistant.config_entries import SOURCE_USER from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME -from tests.async_mock import patch from tests.common import MockConfigEntry, load_fixture VALID_CONFIG = { diff --git a/tests/components/accuweather/test_init.py b/tests/components/accuweather/test_init.py index 0a54132fd68..3e480d57278 100644 --- a/tests/components/accuweather/test_init.py +++ b/tests/components/accuweather/test_init.py @@ -1,4 +1,6 @@ """Test init of AccuWeather integration.""" +from unittest.mock import patch + from homeassistant.components.accuweather.const import DOMAIN from homeassistant.config_entries import ( ENTRY_STATE_LOADED, @@ -7,7 +9,6 @@ from homeassistant.config_entries import ( ) from homeassistant.const import STATE_UNAVAILABLE -from tests.async_mock import patch from tests.common import MockConfigEntry from tests.components.accuweather import init_integration diff --git a/tests/components/accuweather/test_sensor.py b/tests/components/accuweather/test_sensor.py index 185f6024886..361422883d4 100644 --- a/tests/components/accuweather/test_sensor.py +++ b/tests/components/accuweather/test_sensor.py @@ -1,6 +1,7 @@ """Test sensor of AccuWeather integration.""" from datetime import timedelta import json +from unittest.mock import patch from homeassistant.components.accuweather.const import ATTRIBUTION, DOMAIN from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN @@ -24,7 +25,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow -from tests.async_mock import patch from tests.common import async_fire_time_changed, load_fixture from tests.components.accuweather import init_integration diff --git a/tests/components/accuweather/test_system_health.py b/tests/components/accuweather/test_system_health.py index cf8c931e123..749f516e44c 100644 --- a/tests/components/accuweather/test_system_health.py +++ b/tests/components/accuweather/test_system_health.py @@ -1,12 +1,12 @@ """Test AccuWeather system health.""" import asyncio +from unittest.mock import Mock from aiohttp import ClientError from homeassistant.components.accuweather.const import COORDINATOR, DOMAIN from homeassistant.setup import async_setup_component -from tests.async_mock import Mock from tests.common import get_system_health_info diff --git a/tests/components/accuweather/test_weather.py b/tests/components/accuweather/test_weather.py index 692b2ae243f..0c1559ef0d6 100644 --- a/tests/components/accuweather/test_weather.py +++ b/tests/components/accuweather/test_weather.py @@ -1,6 +1,7 @@ """Test weather of AccuWeather integration.""" from datetime import timedelta import json +from unittest.mock import patch from homeassistant.components.accuweather.const import ATTRIBUTION from homeassistant.components.weather import ( @@ -25,7 +26,6 @@ from homeassistant.const import ATTR_ATTRIBUTION, ATTR_ENTITY_ID, STATE_UNAVAILA from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow -from tests.async_mock import patch from tests.common import async_fire_time_changed, load_fixture from tests.components.accuweather import init_integration diff --git a/tests/components/acmeda/test_config_flow.py b/tests/components/acmeda/test_config_flow.py index 2aacedc3680..269a72cd839 100644 --- a/tests/components/acmeda/test_config_flow.py +++ b/tests/components/acmeda/test_config_flow.py @@ -1,4 +1,6 @@ """Define tests for the Acmeda config flow.""" +from unittest.mock import patch + import aiopulse import pytest @@ -7,7 +9,6 @@ from homeassistant.components.acmeda.const import DOMAIN from homeassistant.config_entries import SOURCE_USER from homeassistant.const import CONF_HOST -from tests.async_mock import patch from tests.common import MockConfigEntry DUMMY_HOST1 = "127.0.0.1" diff --git a/tests/components/adguard/test_config_flow.py b/tests/components/adguard/test_config_flow.py index 36263335dac..06fe235741f 100644 --- a/tests/components/adguard/test_config_flow.py +++ b/tests/components/adguard/test_config_flow.py @@ -1,5 +1,7 @@ """Tests for the AdGuard Home config flow.""" +from unittest.mock import patch + import aiohttp from homeassistant import config_entries, data_entry_flow @@ -15,7 +17,6 @@ from homeassistant.const import ( CONTENT_TYPE_JSON, ) -from tests.async_mock import patch from tests.common import MockConfigEntry FIXTURE_USER_INPUT = { diff --git a/tests/components/advantage_air/test_config_flow.py b/tests/components/advantage_air/test_config_flow.py index 248ee25858b..a8e219fff89 100644 --- a/tests/components/advantage_air/test_config_flow.py +++ b/tests/components/advantage_air/test_config_flow.py @@ -1,9 +1,10 @@ """Test the Advantage Air config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, data_entry_flow from homeassistant.components.advantage_air.const import DOMAIN -from tests.async_mock import patch from tests.components.advantage_air import TEST_SYSTEM_DATA, TEST_SYSTEM_URL, USER_INPUT diff --git a/tests/components/airly/test_system_health.py b/tests/components/airly/test_system_health.py index b1f8119e880..02ee67ae452 100644 --- a/tests/components/airly/test_system_health.py +++ b/tests/components/airly/test_system_health.py @@ -1,12 +1,12 @@ """Test Airly system health.""" import asyncio +from unittest.mock import Mock from aiohttp import ClientError from homeassistant.components.airly.const import DOMAIN from homeassistant.setup import async_setup_component -from tests.async_mock import Mock from tests.common import get_system_health_info diff --git a/tests/components/airnow/test_config_flow.py b/tests/components/airnow/test_config_flow.py index 2db3c22795f..f7533b7f5ac 100644 --- a/tests/components/airnow/test_config_flow.py +++ b/tests/components/airnow/test_config_flow.py @@ -1,11 +1,12 @@ """Test the AirNow config flow.""" +from unittest.mock import patch + from pyairnow.errors import AirNowError, InvalidKeyError from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.airnow.const import DOMAIN from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_RADIUS -from tests.async_mock import patch from tests.common import MockConfigEntry CONFIG = { diff --git a/tests/components/airvisual/test_config_flow.py b/tests/components/airvisual/test_config_flow.py index 3eb22360c5c..4e550d94b09 100644 --- a/tests/components/airvisual/test_config_flow.py +++ b/tests/components/airvisual/test_config_flow.py @@ -1,4 +1,6 @@ """Define tests for the AirVisual config flow.""" +from unittest.mock import patch + from pyairvisual.errors import InvalidKeyError, NodeProError from homeassistant import data_entry_flow @@ -20,7 +22,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/alarmdecoder/test_config_flow.py b/tests/components/alarmdecoder/test_config_flow.py index b858671fb54..52d1686691c 100644 --- a/tests/components/alarmdecoder/test_config_flow.py +++ b/tests/components/alarmdecoder/test_config_flow.py @@ -1,4 +1,6 @@ """Test the AlarmDecoder config flow.""" +from unittest.mock import patch + from alarmdecoder.util import NoDeviceError import pytest @@ -29,7 +31,6 @@ from homeassistant.components.binary_sensor import DEVICE_CLASS_WINDOW from homeassistant.const import CONF_HOST, CONF_PORT, CONF_PROTOCOL from homeassistant.core import HomeAssistant -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/alexa/test_capabilities.py b/tests/components/alexa/test_capabilities.py index 2fcc3a236e3..0bdbac70d7d 100644 --- a/tests/components/alexa/test_capabilities.py +++ b/tests/components/alexa/test_capabilities.py @@ -1,4 +1,6 @@ """Test Alexa capabilities.""" +from unittest.mock import patch + import pytest from homeassistant.components.alexa import smart_home @@ -33,7 +35,6 @@ from . import ( reported_properties, ) -from tests.async_mock import patch from tests.common import async_mock_service diff --git a/tests/components/alexa/test_entities.py b/tests/components/alexa/test_entities.py index 6b48c313fcc..c1769bc8d06 100644 --- a/tests/components/alexa/test_entities.py +++ b/tests/components/alexa/test_entities.py @@ -1,10 +1,10 @@ """Test Alexa entity representation.""" +from unittest.mock import patch + from homeassistant.components.alexa import smart_home from . import DEFAULT_CONFIG, get_new_request -from tests.async_mock import patch - async def test_unsupported_domain(hass): """Discovery ignores entities of unknown domains.""" diff --git a/tests/components/alexa/test_smart_home.py b/tests/components/alexa/test_smart_home.py index 9a7f5760270..05a60c86ae0 100644 --- a/tests/components/alexa/test_smart_home.py +++ b/tests/components/alexa/test_smart_home.py @@ -1,5 +1,7 @@ """Test for smart home alexa support.""" +from unittest.mock import patch + import pytest from homeassistant.components.alexa import messages, smart_home @@ -40,7 +42,6 @@ from . import ( reported_properties, ) -from tests.async_mock import patch from tests.common import async_mock_service diff --git a/tests/components/almond/test_config_flow.py b/tests/components/almond/test_config_flow.py index afcad55bf2a..8f6b68e47ee 100644 --- a/tests/components/almond/test_config_flow.py +++ b/tests/components/almond/test_config_flow.py @@ -1,5 +1,6 @@ """Test the Almond config flow.""" import asyncio +from unittest.mock import patch from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.almond import config_flow @@ -7,7 +8,6 @@ from homeassistant.components.almond.const import DOMAIN from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET from homeassistant.helpers import config_entry_oauth2_flow -from tests.async_mock import patch from tests.common import MockConfigEntry CLIENT_ID_VALUE = "1234" diff --git a/tests/components/almond/test_init.py b/tests/components/almond/test_init.py index 35a641bac01..fb74bdfa7f5 100644 --- a/tests/components/almond/test_init.py +++ b/tests/components/almond/test_init.py @@ -1,5 +1,6 @@ """Tests for Almond set up.""" from time import time +from unittest.mock import patch import pytest @@ -10,7 +11,6 @@ from homeassistant.const import EVENT_HOMEASSISTANT_START from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow -from tests.async_mock import patch from tests.common import MockConfigEntry, async_fire_time_changed diff --git a/tests/components/ambiclimate/test_config_flow.py b/tests/components/ambiclimate/test_config_flow.py index 04c714ebb5f..b87c2171815 100644 --- a/tests/components/ambiclimate/test_config_flow.py +++ b/tests/components/ambiclimate/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for the Ambiclimate config flow.""" +from unittest.mock import AsyncMock, patch + import ambiclimate from homeassistant import data_entry_flow @@ -7,8 +9,6 @@ from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET from homeassistant.setup import async_setup_component from homeassistant.util import aiohttp -from tests.async_mock import AsyncMock, patch - async def init_config_flow(hass): """Init a configuration flow.""" diff --git a/tests/components/androidtv/patchers.py b/tests/components/androidtv/patchers.py index b5b6bbd0a46..b8ee4aaa2cd 100644 --- a/tests/components/androidtv/patchers.py +++ b/tests/components/androidtv/patchers.py @@ -1,6 +1,6 @@ """Define patches used for androidtv tests.""" -from tests.async_mock import mock_open, patch +from unittest.mock import mock_open, patch KEY_PYTHON = "python" KEY_SERVER = "server" diff --git a/tests/components/androidtv/test_media_player.py b/tests/components/androidtv/test_media_player.py index f6d189cfbc2..a9a803741b1 100644 --- a/tests/components/androidtv/test_media_player.py +++ b/tests/components/androidtv/test_media_player.py @@ -2,6 +2,7 @@ import base64 import copy import logging +from unittest.mock import patch from androidtv.constants import APPS as ANDROIDTV_APPS from androidtv.exceptions import LockNotAcquiredException @@ -58,7 +59,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.components.androidtv import patchers SHELL_RESPONSE_OFF = "" diff --git a/tests/components/apache_kafka/test_init.py b/tests/components/apache_kafka/test_init.py index ea62bb0569d..7e793bce96a 100644 --- a/tests/components/apache_kafka/test_init.py +++ b/tests/components/apache_kafka/test_init.py @@ -2,6 +2,7 @@ from asyncio import AbstractEventLoop from dataclasses import dataclass from typing import Callable, Type +from unittest.mock import patch import pytest @@ -9,8 +10,6 @@ import homeassistant.components.apache_kafka as apache_kafka from homeassistant.const import STATE_ON from homeassistant.setup import async_setup_component -from tests.async_mock import patch - APACHE_KAFKA_PATH = "homeassistant.components.apache_kafka" PRODUCER_PATH = f"{APACHE_KAFKA_PATH}.AIOKafkaProducer" MIN_CONFIG = { diff --git a/tests/components/api/test_init.py b/tests/components/api/test_init.py index e54af925dec..678a8096af5 100644 --- a/tests/components/api/test_init.py +++ b/tests/components/api/test_init.py @@ -1,6 +1,7 @@ """The tests for the Home Assistant API component.""" # pylint: disable=protected-access import json +from unittest.mock import patch from aiohttp import web import pytest @@ -11,7 +12,6 @@ from homeassistant.bootstrap import DATA_LOGGING import homeassistant.core as ha from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import async_mock_service diff --git a/tests/components/apns/test_notify.py b/tests/components/apns/test_notify.py index 6aa327a3943..22d0a30ab16 100644 --- a/tests/components/apns/test_notify.py +++ b/tests/components/apns/test_notify.py @@ -1,5 +1,6 @@ """The tests for the APNS component.""" import io +from unittest.mock import Mock, mock_open, patch from apns2.errors import Unregistered import pytest @@ -10,7 +11,6 @@ import homeassistant.components.notify as notify from homeassistant.core import State from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, mock_open, patch from tests.common import assert_setup_component CONFIG = { diff --git a/tests/components/apple_tv/conftest.py b/tests/components/apple_tv/conftest.py index 50b57e073d9..db543007fb2 100644 --- a/tests/components/apple_tv/conftest.py +++ b/tests/components/apple_tv/conftest.py @@ -1,12 +1,12 @@ """Fixtures for component.""" +from unittest.mock import patch + from pyatv import conf, net import pytest from .common import MockPairingHandler, create_conf -from tests.async_mock import patch - @pytest.fixture(autouse=True, name="mock_scan") def mock_scan_fixture(): diff --git a/tests/components/apple_tv/test_config_flow.py b/tests/components/apple_tv/test_config_flow.py index 50344dc3c05..c55bef8edfd 100644 --- a/tests/components/apple_tv/test_config_flow.py +++ b/tests/components/apple_tv/test_config_flow.py @@ -1,5 +1,7 @@ """Test config flow.""" +from unittest.mock import patch + from pyatv import exceptions from pyatv.const import Protocol import pytest @@ -7,7 +9,6 @@ import pytest from homeassistant import config_entries, data_entry_flow from homeassistant.components.apple_tv.const import CONF_START_OFF, DOMAIN -from tests.async_mock import patch from tests.common import MockConfigEntry DMAP_SERVICE = { diff --git a/tests/components/apprise/test_notify.py b/tests/components/apprise/test_notify.py index 125971016cb..8135f4e8e2c 100644 --- a/tests/components/apprise/test_notify.py +++ b/tests/components/apprise/test_notify.py @@ -1,7 +1,7 @@ """The tests for the apprise notification platform.""" -from homeassistant.setup import async_setup_component +from unittest.mock import MagicMock, patch -from tests.async_mock import MagicMock, patch +from homeassistant.setup import async_setup_component BASE_COMPONENT = "notify" diff --git a/tests/components/aprs/test_device_tracker.py b/tests/components/aprs/test_device_tracker.py index 95cdf4befec..dc0cf09f28d 100644 --- a/tests/components/aprs/test_device_tracker.py +++ b/tests/components/aprs/test_device_tracker.py @@ -1,10 +1,11 @@ """Test APRS device tracker.""" +from unittest.mock import Mock, patch + import aprslib import homeassistant.components.aprs.device_tracker as device_tracker from homeassistant.const import EVENT_HOMEASSISTANT_START -from tests.async_mock import Mock, patch from tests.common import get_test_home_assistant DEFAULT_PORT = 14580 diff --git a/tests/components/arcam_fmj/conftest.py b/tests/components/arcam_fmj/conftest.py index dfdc9e434f2..2ef0df9511e 100644 --- a/tests/components/arcam_fmj/conftest.py +++ b/tests/components/arcam_fmj/conftest.py @@ -1,4 +1,6 @@ """Tests for the arcam_fmj component.""" +from unittest.mock import Mock, patch + from arcam.fmj.client import Client from arcam.fmj.state import State import pytest @@ -7,7 +9,6 @@ from homeassistant.components.arcam_fmj.const import DEFAULT_NAME from homeassistant.components.arcam_fmj.media_player import ArcamFmj from homeassistant.const import CONF_HOST, CONF_PORT -from tests.async_mock import Mock, patch from tests.common import MockConfigEntry MOCK_HOST = "127.0.0.1" diff --git a/tests/components/arcam_fmj/test_config_flow.py b/tests/components/arcam_fmj/test_config_flow.py index 7de4b83723e..6c86b2bbf96 100644 --- a/tests/components/arcam_fmj/test_config_flow.py +++ b/tests/components/arcam_fmj/test_config_flow.py @@ -1,5 +1,7 @@ """Tests for the Arcam FMJ config flow module.""" +from unittest.mock import AsyncMock, patch + from arcam.fmj.client import ConnectionFailed import pytest @@ -19,7 +21,6 @@ from .conftest import ( MOCK_UUID, ) -from tests.async_mock import AsyncMock, patch from tests.common import MockConfigEntry MOCK_UPNP_DEVICE = f""" diff --git a/tests/components/arcam_fmj/test_media_player.py b/tests/components/arcam_fmj/test_media_player.py index 91117cff0a2..05a070aada2 100644 --- a/tests/components/arcam_fmj/test_media_player.py +++ b/tests/components/arcam_fmj/test_media_player.py @@ -1,5 +1,6 @@ """Tests for arcam fmj receivers.""" from math import isclose +from unittest.mock import ANY, MagicMock, Mock, PropertyMock, patch from arcam.fmj import DecodeMode2CH, DecodeModeMCH, IncomingAudioFormat, SourceCodes import pytest @@ -13,8 +14,6 @@ from homeassistant.const import ATTR_ENTITY_ID from .conftest import MOCK_HOST, MOCK_NAME, MOCK_PORT, MOCK_UUID -from tests.async_mock import ANY, MagicMock, Mock, PropertyMock, patch - MOCK_TURN_ON = { "service": "switch.turn_on", "data": {"entity_id": "switch.test"}, diff --git a/tests/components/arlo/test_sensor.py b/tests/components/arlo/test_sensor.py index 85a1d1e315a..5d729a5a658 100644 --- a/tests/components/arlo/test_sensor.py +++ b/tests/components/arlo/test_sensor.py @@ -1,5 +1,6 @@ """The tests for the Netgear Arlo sensors.""" from collections import namedtuple +from unittest.mock import patch import pytest @@ -11,8 +12,6 @@ from homeassistant.const import ( PERCENTAGE, ) -from tests.async_mock import patch - def _get_named_tuple(input_dict): return namedtuple("Struct", input_dict.keys())(*input_dict.values()) diff --git a/tests/components/asuswrt/test_device_tracker.py b/tests/components/asuswrt/test_device_tracker.py index ed733b54d25..941b0c340d6 100644 --- a/tests/components/asuswrt/test_device_tracker.py +++ b/tests/components/asuswrt/test_device_tracker.py @@ -1,5 +1,7 @@ """The tests for the ASUSWRT device tracker platform.""" +from unittest.mock import AsyncMock, patch + from homeassistant.components.asuswrt import ( CONF_DNSMASQ, CONF_INTERFACE, @@ -9,8 +11,6 @@ from homeassistant.components.asuswrt import ( from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock, patch - async def test_password_or_pub_key_required(hass): """Test creating an AsusWRT scanner without a pass or pubkey.""" diff --git a/tests/components/asuswrt/test_sensor.py b/tests/components/asuswrt/test_sensor.py index 7c929992473..69c70c409d5 100644 --- a/tests/components/asuswrt/test_sensor.py +++ b/tests/components/asuswrt/test_sensor.py @@ -1,5 +1,7 @@ """The tests for the AsusWrt sensor platform.""" +from unittest.mock import AsyncMock, patch + from aioasuswrt.asuswrt import Device from homeassistant.components import sensor @@ -16,8 +18,6 @@ from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME from homeassistant.core import HomeAssistant from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock, patch - VALID_CONFIG_ROUTER_SSH = { DOMAIN: { CONF_DNSMASQ: "/", diff --git a/tests/components/atag/test_climate.py b/tests/components/atag/test_climate.py index 48418050d2d..3d511821baf 100644 --- a/tests/components/atag/test_climate.py +++ b/tests/components/atag/test_climate.py @@ -1,5 +1,7 @@ """Tests for the Atag climate platform.""" +from unittest.mock import PropertyMock, patch + from homeassistant.components.atag import CLIMATE, DOMAIN from homeassistant.components.climate import ( ATTR_HVAC_ACTION, @@ -19,7 +21,6 @@ from homeassistant.const import ATTR_ENTITY_ID, ATTR_TEMPERATURE, STATE_UNKNOWN from homeassistant.core import HomeAssistant from homeassistant.setup import async_setup_component -from tests.async_mock import PropertyMock, patch from tests.components.atag import UID, init_integration from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/atag/test_config_flow.py b/tests/components/atag/test_config_flow.py index 59d8d99670c..81375792c71 100644 --- a/tests/components/atag/test_config_flow.py +++ b/tests/components/atag/test_config_flow.py @@ -1,11 +1,12 @@ """Tests for the Atag config flow.""" +from unittest.mock import PropertyMock, patch + from pyatag import errors from homeassistant import config_entries, data_entry_flow from homeassistant.components.atag import DOMAIN from homeassistant.core import HomeAssistant -from tests.async_mock import PropertyMock, patch from tests.components.atag import ( PAIR_REPLY, RECEIVE_REPLY, diff --git a/tests/components/atag/test_init.py b/tests/components/atag/test_init.py index 9f7ae9cb4ed..b86de8a8be5 100644 --- a/tests/components/atag/test_init.py +++ b/tests/components/atag/test_init.py @@ -1,11 +1,12 @@ """Tests for the ATAG integration.""" +from unittest.mock import patch + import aiohttp from homeassistant.components.atag import DOMAIN from homeassistant.config_entries import ENTRY_STATE_SETUP_RETRY from homeassistant.core import HomeAssistant -from tests.async_mock import patch from tests.components.atag import init_integration from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/atag/test_water_heater.py b/tests/components/atag/test_water_heater.py index 0d717db70bc..5eb219fa3bc 100644 --- a/tests/components/atag/test_water_heater.py +++ b/tests/components/atag/test_water_heater.py @@ -1,11 +1,12 @@ """Tests for the Atag water heater platform.""" +from unittest.mock import patch + from homeassistant.components.atag import DOMAIN, WATER_HEATER from homeassistant.components.water_heater import SERVICE_SET_TEMPERATURE from homeassistant.const import ATTR_ENTITY_ID, ATTR_TEMPERATURE from homeassistant.core import HomeAssistant -from tests.async_mock import patch from tests.components.atag import UID, init_integration from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/august/mocks.py b/tests/components/august/mocks.py index 93b64ebbd3f..e02e1ec59dd 100644 --- a/tests/components/august/mocks.py +++ b/tests/components/august/mocks.py @@ -3,6 +3,9 @@ import json import os import time +# from unittest.mock import AsyncMock +from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch + from august.activity import ( ACTIVITY_ACTIONS_DOOR_OPERATION, ACTIVITY_ACTIONS_DOORBELL_DING, @@ -27,8 +30,6 @@ from homeassistant.components.august import ( ) from homeassistant.setup import async_setup_component -# from tests.async_mock import AsyncMock -from tests.async_mock import AsyncMock, MagicMock, PropertyMock, patch from tests.common import load_fixture diff --git a/tests/components/august/test_camera.py b/tests/components/august/test_camera.py index 3ec1b2d608c..151f7972e1e 100644 --- a/tests/components/august/test_camera.py +++ b/tests/components/august/test_camera.py @@ -1,8 +1,9 @@ """The camera tests for the august platform.""" +from unittest.mock import patch + from homeassistant.const import STATE_IDLE -from tests.async_mock import patch from tests.components.august.mocks import ( _create_august_with_devices, _mock_doorbell_from_fixture, diff --git a/tests/components/august/test_config_flow.py b/tests/components/august/test_config_flow.py index 0f9a8ebbd2f..c1e7c9bb3c5 100644 --- a/tests/components/august/test_config_flow.py +++ b/tests/components/august/test_config_flow.py @@ -1,4 +1,6 @@ """Test the August config flow.""" +from unittest.mock import patch + from august.authenticator import ValidationResult from homeassistant import config_entries, setup @@ -16,7 +18,6 @@ from homeassistant.components.august.exceptions import ( ) from homeassistant.const import CONF_PASSWORD, CONF_TIMEOUT, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/august/test_gateway.py b/tests/components/august/test_gateway.py index c1aa0723baa..ced07360008 100644 --- a/tests/components/august/test_gateway.py +++ b/tests/components/august/test_gateway.py @@ -1,10 +1,11 @@ """The gateway tests for the august platform.""" +from unittest.mock import MagicMock, patch + from august.authenticator_common import AuthenticationState from homeassistant.components.august.const import DOMAIN from homeassistant.components.august.gateway import AugustGateway -from tests.async_mock import MagicMock, patch from tests.components.august.mocks import _mock_august_authentication, _mock_get_config diff --git a/tests/components/august/test_init.py b/tests/components/august/test_init.py index f954ff83c25..e881ac09c97 100644 --- a/tests/components/august/test_init.py +++ b/tests/components/august/test_init.py @@ -1,5 +1,6 @@ """The tests for the august platform.""" import asyncio +from unittest.mock import patch from aiohttp import ClientResponseError from august.authenticator_common import AuthenticationState @@ -31,7 +32,6 @@ from homeassistant.const import ( from homeassistant.exceptions import HomeAssistantError from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import MockConfigEntry from tests.components.august.mocks import ( _create_august_with_devices, diff --git a/tests/components/aurora/test_config_flow.py b/tests/components/aurora/test_config_flow.py index 2f4b457a9dd..b9e0496f668 100644 --- a/tests/components/aurora/test_config_flow.py +++ b/tests/components/aurora/test_config_flow.py @@ -1,9 +1,10 @@ """Test the Aurora config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.aurora.const import DOMAIN -from tests.async_mock import patch from tests.common import MockConfigEntry DATA = { diff --git a/tests/components/auth/test_indieauth.py b/tests/components/auth/test_indieauth.py index e8aabce4678..4cf7402725d 100644 --- a/tests/components/auth/test_indieauth.py +++ b/tests/components/auth/test_indieauth.py @@ -1,11 +1,11 @@ """Tests for the client validator.""" import asyncio +from unittest.mock import patch import pytest from homeassistant.components.auth import indieauth -from tests.async_mock import patch from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/auth/test_init.py b/tests/components/auth/test_init.py index 3d799fe0078..2c9a39c6fb6 100644 --- a/tests/components/auth/test_init.py +++ b/tests/components/auth/test_init.py @@ -1,5 +1,6 @@ """Integration tests for the auth component.""" from datetime import timedelta +from unittest.mock import patch from homeassistant.auth.models import Credentials from homeassistant.components import auth @@ -9,7 +10,6 @@ from homeassistant.util.dt import utcnow from . import async_setup_auth -from tests.async_mock import patch from tests.common import CLIENT_ID, CLIENT_REDIRECT_URI, MockUser diff --git a/tests/components/auth/test_login_flow.py b/tests/components/auth/test_login_flow.py index f2629a27bb9..e6e5281d601 100644 --- a/tests/components/auth/test_login_flow.py +++ b/tests/components/auth/test_login_flow.py @@ -1,7 +1,8 @@ """Tests for the login flow.""" +from unittest.mock import patch + from . import async_setup_auth -from tests.async_mock import patch from tests.common import CLIENT_ID, CLIENT_REDIRECT_URI diff --git a/tests/components/automation/test_blueprint.py b/tests/components/automation/test_blueprint.py index 56062af17b7..1a6ccec7a8e 100644 --- a/tests/components/automation/test_blueprint.py +++ b/tests/components/automation/test_blueprint.py @@ -3,6 +3,7 @@ import asyncio import contextlib from datetime import timedelta import pathlib +from unittest.mock import patch from homeassistant.components import automation from homeassistant.components.blueprint import models @@ -10,7 +11,6 @@ from homeassistant.core import callback from homeassistant.setup import async_setup_component from homeassistant.util import dt as dt_util, yaml -from tests.async_mock import patch from tests.common import async_fire_time_changed, async_mock_service BUILTIN_BLUEPRINT_FOLDER = pathlib.Path(automation.__file__).parent / "blueprints" diff --git a/tests/components/automation/test_init.py b/tests/components/automation/test_init.py index 5f258fc28b7..244f37ecb9c 100644 --- a/tests/components/automation/test_init.py +++ b/tests/components/automation/test_init.py @@ -1,5 +1,6 @@ """The tests for the automation component.""" import asyncio +from unittest.mock import Mock, patch import pytest @@ -28,7 +29,6 @@ from homeassistant.exceptions import HomeAssistantError, Unauthorized from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import Mock, patch from tests.common import assert_setup_component, async_mock_service, mock_restore_cache from tests.components.logbook.test_init import MockLazyEventPartialState diff --git a/tests/components/awair/test_config_flow.py b/tests/components/awair/test_config_flow.py index 6dcbc7eac9e..92d92dd5a63 100644 --- a/tests/components/awair/test_config_flow.py +++ b/tests/components/awair/test_config_flow.py @@ -1,5 +1,7 @@ """Define tests for the Awair config flow.""" +from unittest.mock import patch + from python_awair.exceptions import AuthError, AwairError from homeassistant import data_entry_flow @@ -9,7 +11,6 @@ from homeassistant.const import CONF_ACCESS_TOKEN from .const import CONFIG, DEVICES_FIXTURE, NO_DEVICES_FIXTURE, UNIQUE_ID, USER_FIXTURE -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/awair/test_sensor.py b/tests/components/awair/test_sensor.py index 3b013fad29c..0fcbab99a3a 100644 --- a/tests/components/awair/test_sensor.py +++ b/tests/components/awair/test_sensor.py @@ -1,5 +1,7 @@ """Tests for the Awair sensor platform.""" +from unittest.mock import patch + from homeassistant.components.awair.const import ( API_CO2, API_HUMID, @@ -40,7 +42,6 @@ from .const import ( USER_FIXTURE, ) -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/aws/test_init.py b/tests/components/aws/test_init.py index 045ad2ff609..e50c0aa546b 100644 --- a/tests/components/aws/test_init.py +++ b/tests/components/aws/test_init.py @@ -1,9 +1,9 @@ """Tests for the aws component config and setup.""" +from unittest.mock import AsyncMock, MagicMock, patch as async_patch + from homeassistant.components import aws from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock, MagicMock, patch as async_patch - class MockAioSession: """Mock AioSession.""" diff --git a/tests/components/axis/test_camera.py b/tests/components/axis/test_camera.py index 01c5a677e38..9a5872b4f2d 100644 --- a/tests/components/axis/test_camera.py +++ b/tests/components/axis/test_camera.py @@ -1,5 +1,7 @@ """Axis camera platform tests.""" +from unittest.mock import patch + from homeassistant.components import camera from homeassistant.components.axis.const import ( CONF_STREAM_PROFILE, @@ -11,8 +13,6 @@ from homeassistant.setup import async_setup_component from .test_device import ENTRY_OPTIONS, NAME, setup_axis_integration -from tests.async_mock import patch - async def test_platform_manually_configured(hass): """Test that nothing happens when platform is manually configured.""" diff --git a/tests/components/axis/test_config_flow.py b/tests/components/axis/test_config_flow.py index b9dceec7477..a557c1144e5 100644 --- a/tests/components/axis/test_config_flow.py +++ b/tests/components/axis/test_config_flow.py @@ -1,4 +1,6 @@ """Test Axis config flow.""" +from unittest.mock import patch + from homeassistant import data_entry_flow from homeassistant.components.axis import config_flow from homeassistant.components.axis.const import ( @@ -25,7 +27,6 @@ from homeassistant.data_entry_flow import ( from .test_device import MAC, MODEL, NAME, setup_axis_integration, vapix_request -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/axis/test_device.py b/tests/components/axis/test_device.py index b7612a01c1d..ec9313e3cd5 100644 --- a/tests/components/axis/test_device.py +++ b/tests/components/axis/test_device.py @@ -1,6 +1,7 @@ """Test Axis device.""" from copy import deepcopy from unittest import mock +from unittest.mock import AsyncMock, Mock, patch import axis as axislib from axis.api_discovery import URL as API_DISCOVERY_URL @@ -40,7 +41,6 @@ from homeassistant.const import ( STATE_ON, ) -from tests.async_mock import AsyncMock, Mock, patch from tests.common import MockConfigEntry, async_fire_mqtt_message MAC = "00408C12345" diff --git a/tests/components/axis/test_init.py b/tests/components/axis/test_init.py index cf5253d4675..345dfac4d11 100644 --- a/tests/components/axis/test_init.py +++ b/tests/components/axis/test_init.py @@ -1,4 +1,6 @@ """Test Axis component setup process.""" +from unittest.mock import AsyncMock, Mock, patch + from homeassistant.components import axis from homeassistant.components.axis.const import CONF_MODEL, DOMAIN as AXIS_DOMAIN from homeassistant.const import ( @@ -14,7 +16,6 @@ from homeassistant.setup import async_setup_component from .test_device import MAC, setup_axis_integration -from tests.async_mock import AsyncMock, Mock, patch from tests.common import MockConfigEntry diff --git a/tests/components/axis/test_light.py b/tests/components/axis/test_light.py index 06612daa313..05b58c04565 100644 --- a/tests/components/axis/test_light.py +++ b/tests/components/axis/test_light.py @@ -1,6 +1,7 @@ """Axis light platform tests.""" from copy import deepcopy +from unittest.mock import patch from homeassistant.components.axis.const import DOMAIN as AXIS_DOMAIN from homeassistant.components.light import ATTR_BRIGHTNESS, DOMAIN as LIGHT_DOMAIN @@ -15,8 +16,6 @@ from homeassistant.setup import async_setup_component from .test_device import API_DISCOVERY_RESPONSE, NAME, setup_axis_integration -from tests.async_mock import patch - API_DISCOVERY_LIGHT_CONTROL = { "id": "light-control", "version": "1.1", diff --git a/tests/components/axis/test_switch.py b/tests/components/axis/test_switch.py index fbcf0624fc9..2f8cde777b5 100644 --- a/tests/components/axis/test_switch.py +++ b/tests/components/axis/test_switch.py @@ -1,6 +1,7 @@ """Axis switch platform tests.""" from copy import deepcopy +from unittest.mock import AsyncMock, patch from homeassistant.components.axis.const import DOMAIN as AXIS_DOMAIN from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN @@ -20,8 +21,6 @@ from .test_device import ( setup_axis_integration, ) -from tests.async_mock import AsyncMock, patch - EVENTS = [ { "operation": "Initialized", diff --git a/tests/components/azure_devops/test_config_flow.py b/tests/components/azure_devops/test_config_flow.py index daad5992350..4cda9076b98 100644 --- a/tests/components/azure_devops/test_config_flow.py +++ b/tests/components/azure_devops/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Azure DevOps config flow.""" +from unittest.mock import patch + from aioazuredevops.core import DevOpsProject import aiohttp @@ -11,7 +13,6 @@ from homeassistant.components.azure_devops.const import ( ) from homeassistant.core import HomeAssistant -from tests.async_mock import patch from tests.common import MockConfigEntry FIXTURE_REAUTH_INPUT = {CONF_PAT: "abc123"} diff --git a/tests/components/azure_event_hub/test_init.py b/tests/components/azure_event_hub/test_init.py index 42bfefbcb3c..dd588ad7499 100644 --- a/tests/components/azure_event_hub/test_init.py +++ b/tests/components/azure_event_hub/test_init.py @@ -1,5 +1,6 @@ """The tests for the Azure Event Hub component.""" from dataclasses import dataclass +from unittest.mock import MagicMock, patch import pytest @@ -7,8 +8,6 @@ import homeassistant.components.azure_event_hub as azure_event_hub from homeassistant.const import STATE_ON from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, patch - AZURE_EVENT_HUB_PATH = "homeassistant.components.azure_event_hub" PRODUCER_PATH = f"{AZURE_EVENT_HUB_PATH}.EventHubProducerClient" MIN_CONFIG = { diff --git a/tests/components/bayesian/test_binary_sensor.py b/tests/components/bayesian/test_binary_sensor.py index 2be01679777..01f2664ea67 100644 --- a/tests/components/bayesian/test_binary_sensor.py +++ b/tests/components/bayesian/test_binary_sensor.py @@ -1,6 +1,7 @@ """The test for the bayesian sensor platform.""" import json from os import path +from unittest.mock import patch from homeassistant import config as hass_config from homeassistant.components.bayesian import DOMAIN, binary_sensor as bayesian @@ -18,8 +19,6 @@ from homeassistant.const import ( from homeassistant.core import Context, callback from homeassistant.setup import async_setup_component -from tests.async_mock import patch - async def test_load_values_when_added_to_hass(hass): """Test that sensor initializes with observations of relevant entities.""" diff --git a/tests/components/binary_sensor/test_device_condition.py b/tests/components/binary_sensor/test_device_condition.py index 7a7e80e36a3..f25b529d426 100644 --- a/tests/components/binary_sensor/test_device_condition.py +++ b/tests/components/binary_sensor/test_device_condition.py @@ -1,5 +1,6 @@ """The test for binary_sensor device automation.""" from datetime import timedelta +from unittest.mock import patch import pytest @@ -11,7 +12,6 @@ from homeassistant.helpers import device_registry from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import ( MockConfigEntry, async_get_device_automation_capabilities, diff --git a/tests/components/blebox/conftest.py b/tests/components/blebox/conftest.py index e43fb9fc4b4..3b12c682f3f 100644 --- a/tests/components/blebox/conftest.py +++ b/tests/components/blebox/conftest.py @@ -1,5 +1,6 @@ """PyTest fixtures and test helpers.""" from unittest import mock +from unittest.mock import AsyncMock, PropertyMock, patch import blebox_uniapi import pytest @@ -8,7 +9,6 @@ from homeassistant.components.blebox.const import DOMAIN from homeassistant.const import CONF_HOST, CONF_PORT from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock, PropertyMock, patch from tests.common import MockConfigEntry from tests.components.light.conftest import mock_light_profiles # noqa diff --git a/tests/components/blebox/test_air_quality.py b/tests/components/blebox/test_air_quality.py index 3467c94411c..4f1f6dff671 100644 --- a/tests/components/blebox/test_air_quality.py +++ b/tests/components/blebox/test_air_quality.py @@ -1,6 +1,7 @@ """Blebox air_quality tests.""" import logging +from unittest.mock import AsyncMock, PropertyMock import blebox_uniapi import pytest @@ -10,8 +11,6 @@ from homeassistant.const import ATTR_ICON, STATE_UNKNOWN from .conftest import async_setup_entity, mock_feature -from tests.async_mock import AsyncMock, PropertyMock - @pytest.fixture(name="airsensor") def airsensor_fixture(): diff --git a/tests/components/blebox/test_climate.py b/tests/components/blebox/test_climate.py index c36c93a7f98..baaa5a5009e 100644 --- a/tests/components/blebox/test_climate.py +++ b/tests/components/blebox/test_climate.py @@ -1,6 +1,7 @@ """BleBox climate entities tests.""" import logging +from unittest.mock import AsyncMock, PropertyMock import blebox_uniapi import pytest @@ -30,8 +31,6 @@ from homeassistant.const import ( from .conftest import async_setup_entity, mock_feature -from tests.async_mock import AsyncMock, PropertyMock - @pytest.fixture(name="saunabox") def saunabox_fixture(): diff --git a/tests/components/blebox/test_config_flow.py b/tests/components/blebox/test_config_flow.py index a7200b05b28..965c707d2af 100644 --- a/tests/components/blebox/test_config_flow.py +++ b/tests/components/blebox/test_config_flow.py @@ -1,5 +1,7 @@ """Test Home Assistant config flow for BleBox devices.""" +from unittest.mock import DEFAULT, AsyncMock, PropertyMock, patch + import blebox_uniapi import pytest @@ -9,8 +11,6 @@ from homeassistant.setup import async_setup_component from .conftest import mock_config, mock_only_feature, setup_product_mock -from tests.async_mock import DEFAULT, AsyncMock, PropertyMock, patch - def create_valid_feature_mock(path="homeassistant.components.blebox.Products"): """Return a valid, complete BleBox feature mock.""" diff --git a/tests/components/blebox/test_cover.py b/tests/components/blebox/test_cover.py index cd060445bf7..a5d3a8f705b 100644 --- a/tests/components/blebox/test_cover.py +++ b/tests/components/blebox/test_cover.py @@ -1,6 +1,7 @@ """BleBox cover entities tests.""" import logging +from unittest.mock import AsyncMock, PropertyMock import blebox_uniapi import pytest @@ -32,8 +33,6 @@ from homeassistant.const import ( from .conftest import async_setup_entity, mock_feature -from tests.async_mock import AsyncMock, PropertyMock - ALL_COVER_FIXTURES = ["gatecontroller", "shutterbox", "gatebox"] FIXTURES_SUPPORTING_STOP = ["gatecontroller", "shutterbox"] diff --git a/tests/components/blebox/test_light.py b/tests/components/blebox/test_light.py index 48af534545c..5d9e5709e4d 100644 --- a/tests/components/blebox/test_light.py +++ b/tests/components/blebox/test_light.py @@ -1,6 +1,7 @@ """BleBox light entities tests.""" import logging +from unittest.mock import AsyncMock, PropertyMock import blebox_uniapi import pytest @@ -24,8 +25,6 @@ from homeassistant.util import color from .conftest import async_setup_entity, mock_feature -from tests.async_mock import AsyncMock, PropertyMock - ALL_LIGHT_FIXTURES = ["dimmer", "wlightbox_s", "wlightbox"] diff --git a/tests/components/blebox/test_sensor.py b/tests/components/blebox/test_sensor.py index a19e628181c..aeb726cc726 100644 --- a/tests/components/blebox/test_sensor.py +++ b/tests/components/blebox/test_sensor.py @@ -1,6 +1,7 @@ """Blebox sensors tests.""" import logging +from unittest.mock import AsyncMock, PropertyMock import blebox_uniapi import pytest @@ -15,8 +16,6 @@ from homeassistant.const import ( from .conftest import async_setup_entity, mock_feature -from tests.async_mock import AsyncMock, PropertyMock - @pytest.fixture(name="tempsensor") def tempsensor_fixture(): diff --git a/tests/components/blebox/test_switch.py b/tests/components/blebox/test_switch.py index 43d7d811acc..e2bc1240510 100644 --- a/tests/components/blebox/test_switch.py +++ b/tests/components/blebox/test_switch.py @@ -1,6 +1,7 @@ """Blebox switch tests.""" import logging +from unittest.mock import AsyncMock, PropertyMock import blebox_uniapi import pytest @@ -22,8 +23,6 @@ from .conftest import ( setup_product_mock, ) -from tests.async_mock import AsyncMock, PropertyMock - @pytest.fixture(name="switchbox") def switchbox_fixture(): diff --git a/tests/components/blink/test_config_flow.py b/tests/components/blink/test_config_flow.py index 36e3fbd95ea..91264997769 100644 --- a/tests/components/blink/test_config_flow.py +++ b/tests/components/blink/test_config_flow.py @@ -1,11 +1,12 @@ """Test the Blink config flow.""" +from unittest.mock import Mock, patch + from blinkpy.auth import LoginError from blinkpy.blinkpy import BlinkSetupError from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.blink import DOMAIN -from tests.async_mock import Mock, patch from tests.common import MockConfigEntry diff --git a/tests/components/blueprint/conftest.py b/tests/components/blueprint/conftest.py index c8110ddaf08..ec76451065c 100644 --- a/tests/components/blueprint/conftest.py +++ b/tests/components/blueprint/conftest.py @@ -1,8 +1,8 @@ """Blueprints conftest.""" -import pytest +from unittest.mock import patch -from tests.async_mock import patch +import pytest @pytest.fixture(autouse=True) diff --git a/tests/components/blueprint/test_models.py b/tests/components/blueprint/test_models.py index 6e15bd952a4..ba8914c3b1d 100644 --- a/tests/components/blueprint/test_models.py +++ b/tests/components/blueprint/test_models.py @@ -1,13 +1,12 @@ """Test blueprint models.""" import logging +from unittest.mock import patch import pytest from homeassistant.components.blueprint import errors, models from homeassistant.util.yaml import Input -from tests.async_mock import patch - @pytest.fixture def blueprint_1(): diff --git a/tests/components/blueprint/test_websocket_api.py b/tests/components/blueprint/test_websocket_api.py index bb08414b6e8..6dfd445c634 100644 --- a/tests/components/blueprint/test_websocket_api.py +++ b/tests/components/blueprint/test_websocket_api.py @@ -1,12 +1,11 @@ """Test websocket API.""" from pathlib import Path +from unittest.mock import Mock, patch import pytest from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, patch - @pytest.fixture(autouse=True) async def setup_bp(hass): diff --git a/tests/components/bluetooth_le_tracker/test_device_tracker.py b/tests/components/bluetooth_le_tracker/test_device_tracker.py index af4df463339..308371c9aaa 100644 --- a/tests/components/bluetooth_le_tracker/test_device_tracker.py +++ b/tests/components/bluetooth_le_tracker/test_device_tracker.py @@ -1,6 +1,7 @@ """Test Bluetooth LE device tracker.""" from datetime import timedelta +from unittest.mock import patch from homeassistant.components.bluetooth_le_tracker import device_tracker from homeassistant.components.device_tracker.const import ( @@ -12,7 +13,6 @@ from homeassistant.const import CONF_PLATFORM from homeassistant.setup import async_setup_component from homeassistant.util import dt as dt_util, slugify -from tests.async_mock import patch from tests.common import async_fire_time_changed diff --git a/tests/components/bmw_connected_drive/test_config_flow.py b/tests/components/bmw_connected_drive/test_config_flow.py index ae32feec7b1..52433f2f58f 100644 --- a/tests/components/bmw_connected_drive/test_config_flow.py +++ b/tests/components/bmw_connected_drive/test_config_flow.py @@ -1,4 +1,6 @@ """Test the for the BMW Connected Drive config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, data_entry_flow from homeassistant.components.bmw_connected_drive.config_flow import DOMAIN from homeassistant.components.bmw_connected_drive.const import ( @@ -8,7 +10,6 @@ from homeassistant.components.bmw_connected_drive.const import ( ) from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry FIXTURE_USER_INPUT = { diff --git a/tests/components/bond/common.py b/tests/components/bond/common.py index d5e4a0b9418..9aaaf9a249d 100644 --- a/tests/components/bond/common.py +++ b/tests/components/bond/common.py @@ -3,6 +3,7 @@ from asyncio import TimeoutError as AsyncIOTimeoutError from contextlib import nullcontext from datetime import timedelta from typing import Any, Dict, Optional +from unittest.mock import patch from homeassistant import core from homeassistant.components.bond.const import DOMAIN as BOND_DOMAIN @@ -10,7 +11,6 @@ from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST, STATE_UNAVAILABLE from homeassistant.setup import async_setup_component from homeassistant.util import utcnow -from tests.async_mock import patch from tests.common import MockConfigEntry, async_fire_time_changed diff --git a/tests/components/bond/test_config_flow.py b/tests/components/bond/test_config_flow.py index b87891a1896..dba6c590641 100644 --- a/tests/components/bond/test_config_flow.py +++ b/tests/components/bond/test_config_flow.py @@ -1,5 +1,6 @@ """Test the Bond config flow.""" from typing import Any, Dict +from unittest.mock import Mock, patch from aiohttp import ClientConnectionError, ClientResponseError @@ -9,7 +10,6 @@ from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST from .common import patch_bond_device_ids, patch_bond_version -from tests.async_mock import Mock, patch from tests.common import MockConfigEntry diff --git a/tests/components/braviatv/test_config_flow.py b/tests/components/braviatv/test_config_flow.py index c6f76105cfc..cbe87f14839 100644 --- a/tests/components/braviatv/test_config_flow.py +++ b/tests/components/braviatv/test_config_flow.py @@ -1,4 +1,6 @@ """Define tests for the Bravia TV config flow.""" +from unittest.mock import patch + from bravia_tv.braviarc import NoIPControl from homeassistant import data_entry_flow @@ -6,7 +8,6 @@ from homeassistant.components.braviatv.const import CONF_IGNORED_SOURCES, DOMAIN from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER from homeassistant.const import CONF_HOST, CONF_MAC, CONF_PIN -from tests.async_mock import patch from tests.common import MockConfigEntry BRAVIA_SYSTEM_INFO = { diff --git a/tests/components/broadlink/__init__.py b/tests/components/broadlink/__init__.py index 86756c922f1..7185c605f5c 100644 --- a/tests/components/broadlink/__init__.py +++ b/tests/components/broadlink/__init__.py @@ -1,7 +1,8 @@ """Tests for the Broadlink integration.""" +from unittest.mock import MagicMock, patch + from homeassistant.components.broadlink.const import DOMAIN -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry # Do not edit/remove. Adding is ok. diff --git a/tests/components/broadlink/test_config_flow.py b/tests/components/broadlink/test_config_flow.py index c19d831cf3a..30f19c178b7 100644 --- a/tests/components/broadlink/test_config_flow.py +++ b/tests/components/broadlink/test_config_flow.py @@ -1,6 +1,7 @@ """Test the Broadlink config flow.""" import errno import socket +from unittest.mock import call, patch import broadlink.exceptions as blke import pytest @@ -10,8 +11,6 @@ from homeassistant.components.broadlink.const import DOMAIN from . import get_device -from tests.async_mock import call, patch - DEVICE_DISCOVERY = "homeassistant.components.broadlink.config_flow.blk.discover" DEVICE_FACTORY = "homeassistant.components.broadlink.config_flow.blk.gendevice" diff --git a/tests/components/broadlink/test_device.py b/tests/components/broadlink/test_device.py index d267243aeb9..a105ba26553 100644 --- a/tests/components/broadlink/test_device.py +++ b/tests/components/broadlink/test_device.py @@ -1,4 +1,6 @@ """Tests for Broadlink devices.""" +from unittest.mock import patch + import broadlink.exceptions as blke from homeassistant.components.broadlink.const import DOMAIN @@ -13,7 +15,6 @@ from homeassistant.helpers.entity_registry import async_entries_for_device from . import get_device -from tests.async_mock import patch from tests.common import mock_device_registry, mock_registry diff --git a/tests/components/broadlink/test_remote.py b/tests/components/broadlink/test_remote.py index 941dfc4d3ce..a1be8b364a3 100644 --- a/tests/components/broadlink/test_remote.py +++ b/tests/components/broadlink/test_remote.py @@ -1,5 +1,6 @@ """Tests for Broadlink remotes.""" from base64 import b64decode +from unittest.mock import call from homeassistant.components.broadlink.const import DOMAIN, REMOTE_DOMAIN from homeassistant.components.remote import ( @@ -12,7 +13,6 @@ from homeassistant.helpers.entity_registry import async_entries_for_device from . import get_device -from tests.async_mock import call from tests.common import mock_device_registry, mock_registry REMOTE_DEVICES = ["Entrance", "Living Room", "Office", "Garage"] diff --git a/tests/components/brother/__init__.py b/tests/components/brother/__init__.py index b24ef97705b..b4706d56fba 100644 --- a/tests/components/brother/__init__.py +++ b/tests/components/brother/__init__.py @@ -1,10 +1,10 @@ """Tests for Brother Printer integration.""" import json +from unittest.mock import patch from homeassistant.components.brother.const import DOMAIN from homeassistant.const import CONF_HOST, CONF_TYPE -from tests.async_mock import patch from tests.common import MockConfigEntry, load_fixture diff --git a/tests/components/brother/test_config_flow.py b/tests/components/brother/test_config_flow.py index 153c07deeac..d681ac9c988 100644 --- a/tests/components/brother/test_config_flow.py +++ b/tests/components/brother/test_config_flow.py @@ -1,5 +1,6 @@ """Define tests for the Brother Printer config flow.""" import json +from unittest.mock import patch from brother import SnmpError, UnsupportedModel @@ -8,7 +9,6 @@ from homeassistant.components.brother.const import DOMAIN from homeassistant.config_entries import SOURCE_USER, SOURCE_ZEROCONF from homeassistant.const import CONF_HOST, CONF_TYPE -from tests.async_mock import patch from tests.common import MockConfigEntry, load_fixture CONFIG = {CONF_HOST: "localhost", CONF_TYPE: "laser"} diff --git a/tests/components/brother/test_init.py b/tests/components/brother/test_init.py index 04c3c130fc9..7b85586ce28 100644 --- a/tests/components/brother/test_init.py +++ b/tests/components/brother/test_init.py @@ -1,4 +1,6 @@ """Test init of Brother integration.""" +from unittest.mock import patch + from homeassistant.components.brother.const import DOMAIN from homeassistant.config_entries import ( ENTRY_STATE_LOADED, @@ -7,7 +9,6 @@ from homeassistant.config_entries import ( ) from homeassistant.const import CONF_HOST, CONF_TYPE, STATE_UNAVAILABLE -from tests.async_mock import patch from tests.common import MockConfigEntry from tests.components.brother import init_integration diff --git a/tests/components/brother/test_sensor.py b/tests/components/brother/test_sensor.py index 3f9ee9394b7..b386b0753b7 100644 --- a/tests/components/brother/test_sensor.py +++ b/tests/components/brother/test_sensor.py @@ -1,6 +1,7 @@ """Test sensor of Brother integration.""" from datetime import datetime, timedelta import json +from unittest.mock import Mock, patch from homeassistant.components.brother.const import DOMAIN, UNIT_PAGES from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN @@ -16,7 +17,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component from homeassistant.util.dt import UTC, utcnow -from tests.async_mock import Mock, patch from tests.common import async_fire_time_changed, load_fixture from tests.components.brother import init_integration diff --git a/tests/components/caldav/test_calendar.py b/tests/components/caldav/test_calendar.py index 1b6c21c7358..3e380b44de4 100644 --- a/tests/components/caldav/test_calendar.py +++ b/tests/components/caldav/test_calendar.py @@ -1,5 +1,6 @@ """The tests for the webdav calendar component.""" import datetime +from unittest.mock import MagicMock, Mock, patch from caldav.objects import Event import pytest @@ -8,8 +9,6 @@ from homeassistant.const import STATE_OFF, STATE_ON from homeassistant.setup import async_setup_component from homeassistant.util import dt -from tests.async_mock import MagicMock, Mock, patch - # pylint: disable=redefined-outer-name DEVICE_DATA = {"name": "Private Calendar", "device_id": "Private Calendar"} diff --git a/tests/components/camera/test_init.py b/tests/components/camera/test_init.py index 966adc97b67..2c2d744deb9 100644 --- a/tests/components/camera/test_init.py +++ b/tests/components/camera/test_init.py @@ -2,6 +2,7 @@ import asyncio import base64 import io +from unittest.mock import Mock, PropertyMock, mock_open, patch import pytest @@ -14,7 +15,6 @@ from homeassistant.const import ATTR_ENTITY_ID, EVENT_HOMEASSISTANT_START from homeassistant.exceptions import HomeAssistantError from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, PropertyMock, mock_open, patch from tests.components.camera import common diff --git a/tests/components/canary/__init__.py b/tests/components/canary/__init__.py index 9d0e488d516..27cec31b9e9 100644 --- a/tests/components/canary/__init__.py +++ b/tests/components/canary/__init__.py @@ -1,5 +1,5 @@ """Tests for the Canary integration.""" -from unittest.mock import MagicMock, PropertyMock +from unittest.mock import MagicMock, PropertyMock, patch from canary.api import SensorType @@ -12,7 +12,6 @@ from homeassistant.components.canary.const import ( from homeassistant.const import CONF_PASSWORD, CONF_TIMEOUT, CONF_USERNAME from homeassistant.helpers.typing import HomeAssistantType -from tests.async_mock import patch from tests.common import MockConfigEntry ENTRY_CONFIG = { diff --git a/tests/components/canary/conftest.py b/tests/components/canary/conftest.py index ed0e7f80f8d..26db0dfefcf 100644 --- a/tests/components/canary/conftest.py +++ b/tests/components/canary/conftest.py @@ -1,9 +1,9 @@ """Define fixtures available for all tests.""" +from unittest.mock import MagicMock, patch + from canary.api import Api from pytest import fixture -from tests.async_mock import MagicMock, patch - @fixture(autouse=True) def mock_ffmpeg(hass): diff --git a/tests/components/canary/test_alarm_control_panel.py b/tests/components/canary/test_alarm_control_panel.py index 930fd9613e0..a21284ec376 100644 --- a/tests/components/canary/test_alarm_control_panel.py +++ b/tests/components/canary/test_alarm_control_panel.py @@ -1,4 +1,6 @@ """The tests for the Canary alarm_control_panel platform.""" +from unittest.mock import PropertyMock, patch + from canary.api import LOCATION_MODE_AWAY, LOCATION_MODE_HOME, LOCATION_MODE_NIGHT from homeassistant.components.alarm_control_panel import DOMAIN as ALARM_DOMAIN @@ -18,7 +20,6 @@ from homeassistant.setup import async_setup_component from . import mock_device, mock_location, mock_mode -from tests.async_mock import PropertyMock, patch from tests.common import mock_registry diff --git a/tests/components/canary/test_config_flow.py b/tests/components/canary/test_config_flow.py index e02217dc67e..d194ae21185 100644 --- a/tests/components/canary/test_config_flow.py +++ b/tests/components/canary/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Canary config flow.""" +from unittest.mock import patch + from requests import ConnectTimeout, HTTPError from homeassistant.components.canary.const import ( @@ -18,8 +20,6 @@ from homeassistant.setup import async_setup_component from . import USER_INPUT, _patch_async_setup, _patch_async_setup_entry, init_integration -from tests.async_mock import patch - async def test_user_form(hass, canary_config_flow): """Test we get the user initiated form.""" diff --git a/tests/components/canary/test_init.py b/tests/components/canary/test_init.py index f548a007505..a767eb0ec51 100644 --- a/tests/components/canary/test_init.py +++ b/tests/components/canary/test_init.py @@ -1,4 +1,6 @@ """The tests for the Canary component.""" +from unittest.mock import patch + from requests import ConnectTimeout from homeassistant.components.camera.const import DOMAIN as CAMERA_DOMAIN @@ -13,8 +15,6 @@ from homeassistant.setup import async_setup_component from . import YAML_CONFIG, init_integration -from tests.async_mock import patch - async def test_import_from_yaml(hass, canary) -> None: """Test import from YAML.""" diff --git a/tests/components/canary/test_sensor.py b/tests/components/canary/test_sensor.py index d32741d3705..3f44f047d1c 100644 --- a/tests/components/canary/test_sensor.py +++ b/tests/components/canary/test_sensor.py @@ -1,5 +1,6 @@ """The tests for the Canary sensor platform.""" from datetime import timedelta +from unittest.mock import patch from homeassistant.components.canary.const import DOMAIN, MANUFACTURER from homeassistant.components.canary.sensor import ( @@ -23,7 +24,6 @@ from homeassistant.util.dt import utcnow from . import mock_device, mock_location, mock_reading -from tests.async_mock import patch from tests.common import async_fire_time_changed, mock_device_registry, mock_registry diff --git a/tests/components/cast/test_home_assistant_cast.py b/tests/components/cast/test_home_assistant_cast.py index 8ddb6e82eda..3fd0e921ca6 100644 --- a/tests/components/cast/test_home_assistant_cast.py +++ b/tests/components/cast/test_home_assistant_cast.py @@ -1,10 +1,11 @@ """Test Home Assistant Cast.""" +from unittest.mock import patch + from homeassistant import config_entries from homeassistant.components.cast import home_assistant_cast from homeassistant.config import async_process_ha_core_config -from tests.async_mock import patch from tests.common import MockConfigEntry, async_mock_signal diff --git a/tests/components/cast/test_init.py b/tests/components/cast/test_init.py index 24be4d53ee6..d364256b703 100644 --- a/tests/components/cast/test_init.py +++ b/tests/components/cast/test_init.py @@ -1,11 +1,11 @@ """Tests for the Cast config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, data_entry_flow from homeassistant.components import cast from homeassistant.setup import async_setup_component -from tests.async_mock import patch - async def test_creating_entry_sets_up_media_player(hass): """Test setting up Cast loads the media player.""" diff --git a/tests/components/cast/test_media_player.py b/tests/components/cast/test_media_player.py index 4f75e93faef..c04dc87ad11 100644 --- a/tests/components/cast/test_media_player.py +++ b/tests/components/cast/test_media_player.py @@ -2,6 +2,7 @@ # pylint: disable=protected-access import json from typing import Optional +from unittest.mock import ANY, AsyncMock, MagicMock, Mock, patch from uuid import UUID import attr @@ -16,7 +17,6 @@ from homeassistant.exceptions import PlatformNotReady from homeassistant.helpers.typing import HomeAssistantType from homeassistant.setup import async_setup_component -from tests.async_mock import ANY, AsyncMock, MagicMock, Mock, patch from tests.common import MockConfigEntry, assert_setup_component from tests.components.media_player import common diff --git a/tests/components/cert_expiry/test_config_flow.py b/tests/components/cert_expiry/test_config_flow.py index e5d90e12d13..ed51ebf70a4 100644 --- a/tests/components/cert_expiry/test_config_flow.py +++ b/tests/components/cert_expiry/test_config_flow.py @@ -1,6 +1,7 @@ """Tests for the Cert Expiry config flow.""" import socket import ssl +from unittest.mock import patch from homeassistant import data_entry_flow from homeassistant.components.cert_expiry.const import DEFAULT_PORT, DOMAIN @@ -9,7 +10,6 @@ from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT from .const import HOST, PORT from .helpers import future_timestamp -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/cert_expiry/test_init.py b/tests/components/cert_expiry/test_init.py index 6aa8568a9d1..ea31ba50ea0 100644 --- a/tests/components/cert_expiry/test_init.py +++ b/tests/components/cert_expiry/test_init.py @@ -1,5 +1,6 @@ """Tests for Cert Expiry setup.""" from datetime import timedelta +from unittest.mock import patch from homeassistant.components.cert_expiry.const import DOMAIN from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN @@ -11,7 +12,6 @@ import homeassistant.util.dt as dt_util from .const import HOST, PORT from .helpers import future_timestamp, static_datetime -from tests.async_mock import patch from tests.common import MockConfigEntry, async_fire_time_changed diff --git a/tests/components/cert_expiry/test_sensors.py b/tests/components/cert_expiry/test_sensors.py index 4a78f02b39c..375b676eaf8 100644 --- a/tests/components/cert_expiry/test_sensors.py +++ b/tests/components/cert_expiry/test_sensors.py @@ -2,6 +2,7 @@ from datetime import timedelta import socket import ssl +from unittest.mock import patch from homeassistant.components.cert_expiry.const import DOMAIN from homeassistant.config_entries import ENTRY_STATE_SETUP_RETRY @@ -11,7 +12,6 @@ from homeassistant.util.dt import utcnow from .const import HOST, PORT from .helpers import future_timestamp, static_datetime -from tests.async_mock import patch from tests.common import MockConfigEntry, async_fire_time_changed diff --git a/tests/components/climate/test_init.py b/tests/components/climate/test_init.py index 89c12b4c517..8113c1e343a 100644 --- a/tests/components/climate/test_init.py +++ b/tests/components/climate/test_init.py @@ -1,5 +1,6 @@ """The tests for the climate component.""" from typing import List +from unittest.mock import MagicMock import pytest import voluptuous as vol @@ -12,7 +13,6 @@ from homeassistant.components.climate import ( ClimateEntity, ) -from tests.async_mock import MagicMock from tests.common import async_mock_service diff --git a/tests/components/cloud/__init__.py b/tests/components/cloud/__init__.py index da7c6ff13d0..8613c6408fe 100644 --- a/tests/components/cloud/__init__.py +++ b/tests/components/cloud/__init__.py @@ -1,11 +1,11 @@ """Tests for the cloud component.""" +from unittest.mock import AsyncMock, patch + from homeassistant.components import cloud from homeassistant.components.cloud import const from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock, patch - async def mock_cloud(hass, config=None): """Mock cloud.""" diff --git a/tests/components/cloud/conftest.py b/tests/components/cloud/conftest.py index 02d9b4c41aa..4755d470418 100644 --- a/tests/components/cloud/conftest.py +++ b/tests/components/cloud/conftest.py @@ -1,4 +1,6 @@ """Fixtures for cloud tests.""" +from unittest.mock import patch + import jwt import pytest @@ -6,8 +8,6 @@ from homeassistant.components.cloud import const, prefs from . import mock_cloud, mock_cloud_prefs -from tests.async_mock import patch - @pytest.fixture(autouse=True) def mock_user_data(): diff --git a/tests/components/cloud/test_account_link.py b/tests/components/cloud/test_account_link.py index 1580969b0a5..62225597939 100644 --- a/tests/components/cloud/test_account_link.py +++ b/tests/components/cloud/test_account_link.py @@ -2,6 +2,7 @@ import asyncio import logging from time import time +from unittest.mock import AsyncMock, Mock, patch import pytest @@ -10,7 +11,6 @@ from homeassistant.components.cloud import account_link from homeassistant.helpers import config_entry_oauth2_flow from homeassistant.util.dt import utcnow -from tests.async_mock import AsyncMock, Mock, patch from tests.common import async_fire_time_changed, mock_platform TEST_DOMAIN = "oauth2_test" diff --git a/tests/components/cloud/test_alexa_config.py b/tests/components/cloud/test_alexa_config.py index e54a5dcde01..7286ece2c53 100644 --- a/tests/components/cloud/test_alexa_config.py +++ b/tests/components/cloud/test_alexa_config.py @@ -1,11 +1,11 @@ """Test Alexa config.""" import contextlib +from unittest.mock import AsyncMock, Mock, patch from homeassistant.components.cloud import ALEXA_SCHEMA, alexa_config from homeassistant.helpers.entity_registry import EVENT_ENTITY_REGISTRY_UPDATED from homeassistant.util.dt import utcnow -from tests.async_mock import AsyncMock, Mock, patch from tests.common import async_fire_time_changed diff --git a/tests/components/cloud/test_binary_sensor.py b/tests/components/cloud/test_binary_sensor.py index 6a2d76dc403..c9c9d53981e 100644 --- a/tests/components/cloud/test_binary_sensor.py +++ b/tests/components/cloud/test_binary_sensor.py @@ -1,9 +1,9 @@ """Tests for the cloud binary sensor.""" +from unittest.mock import Mock, patch + from homeassistant.components.cloud.const import DISPATCHER_REMOTE_UPDATE from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, patch - async def test_remote_connection_sensor(hass): """Test the remote connection sensor.""" diff --git a/tests/components/cloud/test_client.py b/tests/components/cloud/test_client.py index 752394b5d0f..dfea8f80cee 100644 --- a/tests/components/cloud/test_client.py +++ b/tests/components/cloud/test_client.py @@ -1,5 +1,6 @@ """Test the cloud.iot module.""" from datetime import timedelta +from unittest.mock import AsyncMock, MagicMock, Mock, patch import aiohttp from aiohttp import web @@ -15,7 +16,6 @@ from homeassistant.util import dt as dt_util from . import mock_cloud, mock_cloud_prefs -from tests.async_mock import AsyncMock, MagicMock, Mock, patch from tests.common import async_fire_time_changed from tests.components.alexa import test_smart_home as test_alexa diff --git a/tests/components/cloud/test_google_config.py b/tests/components/cloud/test_google_config.py index 78207605830..f58ea1a415b 100644 --- a/tests/components/cloud/test_google_config.py +++ b/tests/components/cloud/test_google_config.py @@ -1,4 +1,6 @@ """Test the Cloud Google Config.""" +from unittest.mock import AsyncMock, Mock, patch + import pytest from homeassistant.components.cloud import GACTIONS_SCHEMA @@ -9,7 +11,6 @@ from homeassistant.core import CoreState, State from homeassistant.helpers.entity_registry import EVENT_ENTITY_REGISTRY_UPDATED from homeassistant.util.dt import utcnow -from tests.async_mock import AsyncMock, Mock, patch from tests.common import async_fire_time_changed diff --git a/tests/components/cloud/test_http_api.py b/tests/components/cloud/test_http_api.py index a3c33b31ebb..047a69184ba 100644 --- a/tests/components/cloud/test_http_api.py +++ b/tests/components/cloud/test_http_api.py @@ -1,6 +1,7 @@ """Tests for the HTTP API for the cloud component.""" import asyncio from ipaddress import ip_network +from unittest.mock import AsyncMock, MagicMock, Mock, patch import aiohttp from hass_nabucasa import thingtalk @@ -19,7 +20,6 @@ from homeassistant.core import State from . import mock_cloud, mock_cloud_prefs -from tests.async_mock import AsyncMock, MagicMock, Mock, patch from tests.components.google_assistant import MockConfig SUBSCRIPTION_INFO_URL = "https://api-test.hass.io/subscription_info" diff --git a/tests/components/cloud/test_init.py b/tests/components/cloud/test_init.py index e174b080102..7202c8a0b39 100644 --- a/tests/components/cloud/test_init.py +++ b/tests/components/cloud/test_init.py @@ -1,5 +1,7 @@ """Test the cloud component.""" +from unittest.mock import patch + import pytest from homeassistant.components import cloud @@ -10,8 +12,6 @@ from homeassistant.core import Context from homeassistant.exceptions import Unauthorized from homeassistant.setup import async_setup_component -from tests.async_mock import patch - async def test_constructor_loads_info_from_config(hass): """Test non-dev mode loads info from SERVERS constant.""" diff --git a/tests/components/cloud/test_prefs.py b/tests/components/cloud/test_prefs.py index 4f2d5d6d661..d1b6f9ed867 100644 --- a/tests/components/cloud/test_prefs.py +++ b/tests/components/cloud/test_prefs.py @@ -1,9 +1,9 @@ """Test Cloud preferences.""" +from unittest.mock import patch + from homeassistant.auth.const import GROUP_ID_ADMIN from homeassistant.components.cloud.prefs import STORAGE_KEY, CloudPreferences -from tests.async_mock import patch - async def test_set_username(hass): """Test we clear config if we set different username.""" diff --git a/tests/components/cloud/test_system_health.py b/tests/components/cloud/test_system_health.py index b69ab462ddb..65ffd859f33 100644 --- a/tests/components/cloud/test_system_health.py +++ b/tests/components/cloud/test_system_health.py @@ -1,12 +1,12 @@ """Test cloud system health.""" import asyncio +from unittest.mock import Mock from aiohttp import ClientError from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow -from tests.async_mock import Mock from tests.common import get_system_health_info diff --git a/tests/components/cloudflare/__init__.py b/tests/components/cloudflare/__init__.py index 68eed3afd87..c72a9cd84b0 100644 --- a/tests/components/cloudflare/__init__.py +++ b/tests/components/cloudflare/__init__.py @@ -1,12 +1,12 @@ """Tests for the Cloudflare integration.""" from typing import List +from unittest.mock import AsyncMock, patch from pycfdns import CFRecord from homeassistant.components.cloudflare.const import CONF_RECORDS, DOMAIN from homeassistant.const import CONF_API_TOKEN, CONF_ZONE -from tests.async_mock import AsyncMock, patch from tests.common import MockConfigEntry ENTRY_CONFIG = { diff --git a/tests/components/cloudflare/conftest.py b/tests/components/cloudflare/conftest.py index 1ee381de104..99ca7af26f4 100644 --- a/tests/components/cloudflare/conftest.py +++ b/tests/components/cloudflare/conftest.py @@ -1,10 +1,10 @@ """Define fixtures available for all tests.""" +from unittest.mock import patch + from pytest import fixture from . import _get_mock_cfupdate -from tests.async_mock import patch - @fixture def cfupdate(hass): diff --git a/tests/components/coinmarketcap/test_sensor.py b/tests/components/coinmarketcap/test_sensor.py index 30fc0f0e1f7..369a006f568 100644 --- a/tests/components/coinmarketcap/test_sensor.py +++ b/tests/components/coinmarketcap/test_sensor.py @@ -1,12 +1,12 @@ """Tests for the CoinMarketCap sensor platform.""" import json +from unittest.mock import patch import pytest from homeassistant.components.sensor import DOMAIN from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import assert_setup_component, load_fixture VALID_CONFIG = { diff --git a/tests/components/color_extractor/test_service.py b/tests/components/color_extractor/test_service.py index 31b623f1c76..2a1592fe73f 100644 --- a/tests/components/color_extractor/test_service.py +++ b/tests/components/color_extractor/test_service.py @@ -1,6 +1,7 @@ """Tests for color_extractor component service calls.""" import base64 import io +from unittest.mock import Mock, mock_open, patch import aiohttp import pytest @@ -23,7 +24,6 @@ from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON from homeassistant.setup import async_setup_component import homeassistant.util.color as color_util -from tests.async_mock import Mock, mock_open, patch from tests.common import load_fixture LIGHT_ENTITY = "light.kitchen_lights" diff --git a/tests/components/command_line/test_cover.py b/tests/components/command_line/test_cover.py index 508b1e1fb41..ee692413bcd 100644 --- a/tests/components/command_line/test_cover.py +++ b/tests/components/command_line/test_cover.py @@ -3,6 +3,7 @@ import os from os import path import tempfile from unittest import mock +from unittest.mock import patch import pytest @@ -18,8 +19,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import patch - @pytest.fixture def rs(hass): diff --git a/tests/components/command_line/test_notify.py b/tests/components/command_line/test_notify.py index 8509bc785da..3dcb521cfd2 100644 --- a/tests/components/command_line/test_notify.py +++ b/tests/components/command_line/test_notify.py @@ -2,11 +2,11 @@ import os import tempfile import unittest +from unittest.mock import patch import homeassistant.components.notify as notify from homeassistant.setup import async_setup_component, setup_component -from tests.async_mock import patch from tests.common import assert_setup_component, get_test_home_assistant diff --git a/tests/components/command_line/test_sensor.py b/tests/components/command_line/test_sensor.py index 0a6e29ca00c..042c9acf432 100644 --- a/tests/components/command_line/test_sensor.py +++ b/tests/components/command_line/test_sensor.py @@ -1,10 +1,10 @@ """The tests for the Command line sensor platform.""" import unittest +from unittest.mock import patch from homeassistant.components.command_line import sensor as command_line from homeassistant.helpers.template import Template -from tests.async_mock import patch from tests.common import get_test_home_assistant diff --git a/tests/components/config/test_automation.py b/tests/components/config/test_automation.py index 347ac96f892..00c89edeef0 100644 --- a/tests/components/config/test_automation.py +++ b/tests/components/config/test_automation.py @@ -1,10 +1,10 @@ """Test Automation config panel.""" import json +from unittest.mock import patch from homeassistant.bootstrap import async_setup_component from homeassistant.components import config -from tests.async_mock import patch from tests.components.blueprint.conftest import stub_blueprint_populate # noqa diff --git a/tests/components/config/test_config_entries.py b/tests/components/config/test_config_entries.py index 11299f4108b..6873bc8311a 100644 --- a/tests/components/config/test_config_entries.py +++ b/tests/components/config/test_config_entries.py @@ -1,6 +1,7 @@ """Test config entries API.""" from collections import OrderedDict +from unittest.mock import AsyncMock, patch import pytest import voluptuous as vol @@ -12,7 +13,6 @@ from homeassistant.core import callback from homeassistant.generated import config_flows from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock, patch from tests.common import ( MockConfigEntry, MockModule, diff --git a/tests/components/config/test_core.py b/tests/components/config/test_core.py index 72e655dbb66..361fceab565 100644 --- a/tests/components/config/test_core.py +++ b/tests/components/config/test_core.py @@ -1,4 +1,6 @@ """Test hassbian config.""" +from unittest.mock import patch + import pytest from homeassistant.bootstrap import async_setup_component @@ -7,8 +9,6 @@ from homeassistant.components.websocket_api.const import TYPE_RESULT from homeassistant.const import CONF_UNIT_SYSTEM, CONF_UNIT_SYSTEM_IMPERIAL from homeassistant.util import dt as dt_util, location -from tests.async_mock import patch - ORIG_TIME_ZONE = dt_util.DEFAULT_TIME_ZONE diff --git a/tests/components/config/test_customize.py b/tests/components/config/test_customize.py index ca3bcc98c7d..aac18bc379e 100644 --- a/tests/components/config/test_customize.py +++ b/tests/components/config/test_customize.py @@ -1,12 +1,11 @@ """Test Customize config panel.""" import json +from unittest.mock import patch from homeassistant.bootstrap import async_setup_component from homeassistant.components import config from homeassistant.config import DATA_CUSTOMIZE -from tests.async_mock import patch - async def test_get_entity(hass, hass_client): """Test getting entity.""" diff --git a/tests/components/config/test_group.py b/tests/components/config/test_group.py index 98ad2041713..c4b7cf25800 100644 --- a/tests/components/config/test_group.py +++ b/tests/components/config/test_group.py @@ -1,11 +1,10 @@ """Test Group config panel.""" import json +from unittest.mock import AsyncMock, patch from homeassistant.bootstrap import async_setup_component from homeassistant.components import config -from tests.async_mock import AsyncMock, patch - VIEW_NAME = "api:config:group:config" diff --git a/tests/components/config/test_init.py b/tests/components/config/test_init.py index 6dd16fef7ec..dd3e294bac3 100644 --- a/tests/components/config/test_init.py +++ b/tests/components/config/test_init.py @@ -1,10 +1,11 @@ """Test config init.""" +from unittest.mock import patch + from homeassistant.components import config from homeassistant.const import EVENT_COMPONENT_LOADED from homeassistant.setup import ATTR_COMPONENT, async_setup_component -from tests.async_mock import patch from tests.common import mock_component diff --git a/tests/components/config/test_scene.py b/tests/components/config/test_scene.py index dcaa950f342..bdb2a2e3f10 100644 --- a/tests/components/config/test_scene.py +++ b/tests/components/config/test_scene.py @@ -1,12 +1,11 @@ """Test Automation config panel.""" import json +from unittest.mock import patch from homeassistant.bootstrap import async_setup_component from homeassistant.components import config from homeassistant.util.yaml import dump -from tests.async_mock import patch - async def test_update_scene(hass, hass_client): """Test updating a scene.""" diff --git a/tests/components/config/test_script.py b/tests/components/config/test_script.py index 4dc906e92f3..0026729766c 100644 --- a/tests/components/config/test_script.py +++ b/tests/components/config/test_script.py @@ -1,9 +1,9 @@ """Tests for config/script.""" +from unittest.mock import patch + from homeassistant.bootstrap import async_setup_component from homeassistant.components import config -from tests.async_mock import patch - async def test_delete_script(hass, hass_client): """Test deleting a script.""" diff --git a/tests/components/config/test_zwave.py b/tests/components/config/test_zwave.py index 8b83583d1f5..2f15a167c92 100644 --- a/tests/components/config/test_zwave.py +++ b/tests/components/config/test_zwave.py @@ -1,5 +1,6 @@ """Test Z-Wave config panel.""" import json +from unittest.mock import MagicMock, patch import pytest @@ -8,7 +9,6 @@ from homeassistant.components import config from homeassistant.components.zwave import DATA_NETWORK, const from homeassistant.const import HTTP_NOT_FOUND -from tests.async_mock import MagicMock, patch from tests.mock.zwave import MockEntityValues, MockNode, MockValue VIEW_NAME = "api:config:zwave:device_config" diff --git a/tests/components/conftest.py b/tests/components/conftest.py index acfbdeb8629..3b1781ba510 100644 --- a/tests/components/conftest.py +++ b/tests/components/conftest.py @@ -1,10 +1,10 @@ """Fixtures for component testing.""" +from unittest.mock import patch + import pytest from homeassistant.components import zeroconf -from tests.async_mock import patch - zeroconf.orig_install_multiple_zeroconf_catcher = ( zeroconf.install_multiple_zeroconf_catcher ) diff --git a/tests/components/control4/test_config_flow.py b/tests/components/control4/test_config_flow.py index 8c68039920d..48ff8201166 100644 --- a/tests/components/control4/test_config_flow.py +++ b/tests/components/control4/test_config_flow.py @@ -1,5 +1,6 @@ """Test the Control4 config flow.""" import datetime +from unittest.mock import AsyncMock, patch from pyControl4.account import C4Account from pyControl4.director import C4Director @@ -14,7 +15,6 @@ from homeassistant.const import ( CONF_USERNAME, ) -from tests.async_mock import AsyncMock, patch from tests.common import MockConfigEntry diff --git a/tests/components/coolmaster/test_config_flow.py b/tests/components/coolmaster/test_config_flow.py index 27e44949585..3dd0f27ecdf 100644 --- a/tests/components/coolmaster/test_config_flow.py +++ b/tests/components/coolmaster/test_config_flow.py @@ -1,9 +1,9 @@ """Test the Coolmaster config flow.""" +from unittest.mock import patch + from homeassistant import config_entries from homeassistant.components.coolmaster.const import AVAILABLE_MODES, DOMAIN -from tests.async_mock import patch - def _flow_data(): options = {"host": "1.1.1.1"} diff --git a/tests/components/coronavirus/conftest.py b/tests/components/coronavirus/conftest.py index bbe5a463802..57128268fd7 100644 --- a/tests/components/coronavirus/conftest.py +++ b/tests/components/coronavirus/conftest.py @@ -1,8 +1,8 @@ """Test helpers.""" -import pytest +from unittest.mock import Mock, patch -from tests.async_mock import Mock, patch +import pytest @pytest.fixture(autouse=True) diff --git a/tests/components/daikin/test_config_flow.py b/tests/components/daikin/test_config_flow.py index 3e4ddb6d3fd..a7165b2cb9b 100644 --- a/tests/components/daikin/test_config_flow.py +++ b/tests/components/daikin/test_config_flow.py @@ -1,6 +1,7 @@ # pylint: disable=redefined-outer-name """Tests for the Daikin config flow.""" import asyncio +from unittest.mock import PropertyMock, patch from aiohttp import ClientError from aiohttp.web_exceptions import HTTPForbidden @@ -20,7 +21,6 @@ from homeassistant.data_entry_flow import ( RESULT_TYPE_FORM, ) -from tests.async_mock import PropertyMock, patch from tests.common import MockConfigEntry MAC = "AABBCCDDEEFF" diff --git a/tests/components/darksky/test_sensor.py b/tests/components/darksky/test_sensor.py index be1e9849452..02bc392cd68 100644 --- a/tests/components/darksky/test_sensor.py +++ b/tests/components/darksky/test_sensor.py @@ -2,6 +2,7 @@ from datetime import timedelta import re import unittest +from unittest.mock import MagicMock, patch import forecastio from requests.exceptions import HTTPError @@ -10,7 +11,6 @@ import requests_mock from homeassistant.components.darksky import sensor as darksky from homeassistant.setup import setup_component -from tests.async_mock import MagicMock, patch from tests.common import get_test_home_assistant, load_fixture VALID_CONFIG_MINIMAL = { diff --git a/tests/components/darksky/test_weather.py b/tests/components/darksky/test_weather.py index 1a2a2e156d9..9a1b3912b87 100644 --- a/tests/components/darksky/test_weather.py +++ b/tests/components/darksky/test_weather.py @@ -1,6 +1,7 @@ """The tests for the Dark Sky weather component.""" import re import unittest +from unittest.mock import patch import forecastio from requests.exceptions import ConnectionError @@ -10,7 +11,6 @@ from homeassistant.components import weather from homeassistant.setup import setup_component from homeassistant.util.unit_system import METRIC_SYSTEM -from tests.async_mock import patch from tests.common import get_test_home_assistant, load_fixture diff --git a/tests/components/datadog/test_init.py b/tests/components/datadog/test_init.py index f46ad027442..087e0f4b884 100644 --- a/tests/components/datadog/test_init.py +++ b/tests/components/datadog/test_init.py @@ -1,5 +1,6 @@ """The tests for the Datadog component.""" from unittest import mock +from unittest.mock import MagicMock, patch import homeassistant.components.datadog as datadog from homeassistant.const import ( @@ -11,7 +12,6 @@ from homeassistant.const import ( import homeassistant.core as ha from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, patch from tests.common import assert_setup_component diff --git a/tests/components/debugpy/test_init.py b/tests/components/debugpy/test_init.py index 86be0d788f6..97d08e13bfc 100644 --- a/tests/components/debugpy/test_init.py +++ b/tests/components/debugpy/test_init.py @@ -1,4 +1,6 @@ """Tests for the Remote Python Debugger integration.""" +from unittest.mock import patch + import pytest from homeassistant.components.debugpy import ( @@ -12,8 +14,6 @@ from homeassistant.components.debugpy import ( from homeassistant.core import HomeAssistant from homeassistant.setup import async_setup_component -from tests.async_mock import patch - @pytest.fixture def mock_debugpy(): diff --git a/tests/components/deconz/test_binary_sensor.py b/tests/components/deconz/test_binary_sensor.py index 78a4f1e937d..3611e30f665 100644 --- a/tests/components/deconz/test_binary_sensor.py +++ b/tests/components/deconz/test_binary_sensor.py @@ -1,6 +1,7 @@ """deCONZ binary sensor platform tests.""" from copy import deepcopy +from unittest.mock import patch from homeassistant.components.binary_sensor import ( DEVICE_CLASS_MOTION, @@ -21,8 +22,6 @@ from homeassistant.setup import async_setup_component from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration -from tests.async_mock import patch - SENSORS = { "1": { "id": "Presence sensor id", diff --git a/tests/components/deconz/test_climate.py b/tests/components/deconz/test_climate.py index 319675cf6f7..4d68ba2a6a7 100644 --- a/tests/components/deconz/test_climate.py +++ b/tests/components/deconz/test_climate.py @@ -1,6 +1,7 @@ """deCONZ climate platform tests.""" from copy import deepcopy +from unittest.mock import patch import pytest @@ -43,8 +44,6 @@ from homeassistant.setup import async_setup_component from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration -from tests.async_mock import patch - SENSORS = { "1": { "id": "Thermostat id", diff --git a/tests/components/deconz/test_config_flow.py b/tests/components/deconz/test_config_flow.py index d922dffb623..6a8066e98fb 100644 --- a/tests/components/deconz/test_config_flow.py +++ b/tests/components/deconz/test_config_flow.py @@ -1,6 +1,7 @@ """Tests for deCONZ config flow.""" import asyncio +from unittest.mock import patch import pydeconz @@ -31,8 +32,6 @@ from homeassistant.data_entry_flow import ( from .test_gateway import API_KEY, BRIDGEID, setup_deconz_integration -from tests.async_mock import patch - BAD_BRIDGEID = "0000000000000000" diff --git a/tests/components/deconz/test_cover.py b/tests/components/deconz/test_cover.py index 374d3683a6e..5314a41b315 100644 --- a/tests/components/deconz/test_cover.py +++ b/tests/components/deconz/test_cover.py @@ -1,6 +1,7 @@ """deCONZ cover platform tests.""" from copy import deepcopy +from unittest.mock import patch from homeassistant.components.cover import ( ATTR_CURRENT_TILT_POSITION, @@ -23,8 +24,6 @@ from homeassistant.setup import async_setup_component from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration -from tests.async_mock import patch - COVERS = { "1": { "id": "Level controllable cover id", diff --git a/tests/components/deconz/test_fan.py b/tests/components/deconz/test_fan.py index 6806071dd75..b9c154a2791 100644 --- a/tests/components/deconz/test_fan.py +++ b/tests/components/deconz/test_fan.py @@ -1,6 +1,7 @@ """deCONZ fan platform tests.""" from copy import deepcopy +from unittest.mock import patch import pytest @@ -22,8 +23,6 @@ from homeassistant.setup import async_setup_component from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration -from tests.async_mock import patch - FANS = { "1": { "etag": "432f3de28965052961a99e3c5494daf4", diff --git a/tests/components/deconz/test_gateway.py b/tests/components/deconz/test_gateway.py index 12666cdb692..023d4d32da5 100644 --- a/tests/components/deconz/test_gateway.py +++ b/tests/components/deconz/test_gateway.py @@ -1,6 +1,7 @@ """Test deCONZ gateway.""" from copy import deepcopy +from unittest.mock import Mock, patch import pydeconz import pytest @@ -31,7 +32,6 @@ from homeassistant.config_entries import CONN_CLASS_LOCAL_PUSH, SOURCE_SSDP from homeassistant.const import CONF_API_KEY, CONF_HOST, CONF_PORT from homeassistant.helpers.dispatcher import async_dispatcher_connect -from tests.async_mock import Mock, patch from tests.common import MockConfigEntry API_KEY = "1234567890ABCDEF" diff --git a/tests/components/deconz/test_init.py b/tests/components/deconz/test_init.py index ae7ce5b2a39..d408d764d0e 100644 --- a/tests/components/deconz/test_init.py +++ b/tests/components/deconz/test_init.py @@ -2,6 +2,7 @@ import asyncio from copy import deepcopy +from unittest.mock import patch from homeassistant.components.deconz import ( DeconzGateway, @@ -13,8 +14,6 @@ from homeassistant.components.deconz.gateway import get_gateway_from_config_entr from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration -from tests.async_mock import patch - ENTRY1_HOST = "1.2.3.4" ENTRY1_PORT = 80 ENTRY1_API_KEY = "1234567890ABCDEF" diff --git a/tests/components/deconz/test_light.py b/tests/components/deconz/test_light.py index 18a135a5e05..28d9b4e33fb 100644 --- a/tests/components/deconz/test_light.py +++ b/tests/components/deconz/test_light.py @@ -1,6 +1,7 @@ """deCONZ light platform tests.""" from copy import deepcopy +from unittest.mock import patch from homeassistant.components.deconz.const import ( CONF_ALLOW_DECONZ_GROUPS, @@ -33,8 +34,6 @@ from homeassistant.setup import async_setup_component from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration -from tests.async_mock import patch - GROUPS = { "1": { "id": "Light group id", diff --git a/tests/components/deconz/test_lock.py b/tests/components/deconz/test_lock.py index 2acfb440b13..7e9b8233778 100644 --- a/tests/components/deconz/test_lock.py +++ b/tests/components/deconz/test_lock.py @@ -1,6 +1,7 @@ """deCONZ lock platform tests.""" from copy import deepcopy +from unittest.mock import patch from homeassistant.components.deconz.const import DOMAIN as DECONZ_DOMAIN from homeassistant.components.deconz.gateway import get_gateway_from_config_entry @@ -14,8 +15,6 @@ from homeassistant.setup import async_setup_component from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration -from tests.async_mock import patch - LOCKS = { "1": { "etag": "5c2ec06cde4bd654aef3a555fcd8ad12", diff --git a/tests/components/deconz/test_scene.py b/tests/components/deconz/test_scene.py index c4a92538815..ca8df2c0425 100644 --- a/tests/components/deconz/test_scene.py +++ b/tests/components/deconz/test_scene.py @@ -1,6 +1,7 @@ """deCONZ scene platform tests.""" from copy import deepcopy +from unittest.mock import patch from homeassistant.components.deconz import DOMAIN as DECONZ_DOMAIN from homeassistant.components.deconz.gateway import get_gateway_from_config_entry @@ -10,8 +11,6 @@ from homeassistant.setup import async_setup_component from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration -from tests.async_mock import patch - GROUPS = { "1": { "id": "Light group id", diff --git a/tests/components/deconz/test_services.py b/tests/components/deconz/test_services.py index 26524553dbe..faa1d3485bb 100644 --- a/tests/components/deconz/test_services.py +++ b/tests/components/deconz/test_services.py @@ -1,6 +1,7 @@ """deCONZ service tests.""" from copy import deepcopy +from unittest.mock import Mock, patch import pytest import voluptuous as vol @@ -26,8 +27,6 @@ from homeassistant.helpers.entity_registry import async_entries_for_config_entry from .test_gateway import BRIDGEID, DECONZ_WEB_REQUEST, setup_deconz_integration -from tests.async_mock import Mock, patch - GROUP = { "1": { "id": "Group 1 id", diff --git a/tests/components/deconz/test_switch.py b/tests/components/deconz/test_switch.py index 4f23be3d1e3..e42e89d903e 100644 --- a/tests/components/deconz/test_switch.py +++ b/tests/components/deconz/test_switch.py @@ -1,6 +1,7 @@ """deCONZ switch platform tests.""" from copy import deepcopy +from unittest.mock import patch from homeassistant.components.deconz import DOMAIN as DECONZ_DOMAIN from homeassistant.components.deconz.gateway import get_gateway_from_config_entry @@ -14,8 +15,6 @@ from homeassistant.setup import async_setup_component from .test_gateway import DECONZ_WEB_REQUEST, setup_deconz_integration -from tests.async_mock import patch - POWER_PLUGS = { "1": { "id": "On off switch id", diff --git a/tests/components/default_config/test_init.py b/tests/components/default_config/test_init.py index a4a5898982b..9830d944471 100644 --- a/tests/components/default_config/test_init.py +++ b/tests/components/default_config/test_init.py @@ -1,9 +1,10 @@ """Test the default_config init.""" +from unittest.mock import patch + import pytest from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.components.blueprint.conftest import stub_blueprint_populate # noqa diff --git a/tests/components/demo/test_camera.py b/tests/components/demo/test_camera.py index e62d6db0464..8e73a0beff6 100644 --- a/tests/components/demo/test_camera.py +++ b/tests/components/demo/test_camera.py @@ -1,4 +1,6 @@ """The tests for local file camera component.""" +from unittest.mock import patch + import pytest from homeassistant.components.camera import ( @@ -16,8 +18,6 @@ from homeassistant.const import ATTR_ENTITY_ID from homeassistant.exceptions import HomeAssistantError from homeassistant.setup import async_setup_component -from tests.async_mock import patch - ENTITY_CAMERA = "camera.demo_camera" diff --git a/tests/components/demo/test_geo_location.py b/tests/components/demo/test_geo_location.py index 564d27e7131..c3c233c39be 100644 --- a/tests/components/demo/test_geo_location.py +++ b/tests/components/demo/test_geo_location.py @@ -1,5 +1,7 @@ """The tests for the demo platform.""" +from unittest.mock import patch + import pytest from homeassistant.components import geo_location @@ -16,7 +18,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import assert_setup_component, async_fire_time_changed CONFIG = {geo_location.DOMAIN: [{"platform": "demo"}]} diff --git a/tests/components/demo/test_media_player.py b/tests/components/demo/test_media_player.py index 340416f4586..a32a99bbc63 100644 --- a/tests/components/demo/test_media_player.py +++ b/tests/components/demo/test_media_player.py @@ -1,4 +1,6 @@ """The tests for the Demo Media player platform.""" +from unittest.mock import patch + import pytest import voluptuous as vol @@ -14,8 +16,6 @@ from homeassistant.const import ( from homeassistant.helpers.aiohttp_client import DATA_CLIENTSESSION from homeassistant.setup import async_setup_component -from tests.async_mock import patch - TEST_ENTITY_ID = "media_player.walkman" diff --git a/tests/components/demo/test_notify.py b/tests/components/demo/test_notify.py index 893b9d57e65..7c7f83312dd 100644 --- a/tests/components/demo/test_notify.py +++ b/tests/components/demo/test_notify.py @@ -1,6 +1,7 @@ """The tests for the notify demo platform.""" import logging +from unittest.mock import patch import pytest import voluptuous as vol @@ -11,7 +12,6 @@ from homeassistant.core import callback from homeassistant.helpers import discovery from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import assert_setup_component CONFIG = {notify.DOMAIN: {"platform": "demo"}} diff --git a/tests/components/denonavr/test_config_flow.py b/tests/components/denonavr/test_config_flow.py index b8ea6016131..67d1a4e10db 100644 --- a/tests/components/denonavr/test_config_flow.py +++ b/tests/components/denonavr/test_config_flow.py @@ -1,4 +1,6 @@ """Test the DenonAVR config flow.""" +from unittest.mock import patch + import pytest from homeassistant import config_entries, data_entry_flow @@ -15,7 +17,6 @@ from homeassistant.components.denonavr.config_flow import ( ) from homeassistant.const import CONF_HOST, CONF_MAC -from tests.async_mock import patch from tests.common import MockConfigEntry TEST_HOST = "1.2.3.4" diff --git a/tests/components/derivative/test_sensor.py b/tests/components/derivative/test_sensor.py index 58090f1587d..03861a30c47 100644 --- a/tests/components/derivative/test_sensor.py +++ b/tests/components/derivative/test_sensor.py @@ -1,12 +1,11 @@ """The tests for the derivative sensor platform.""" from datetime import timedelta +from unittest.mock import patch from homeassistant.const import POWER_WATT, TIME_HOURS, TIME_MINUTES, TIME_SECONDS from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch - async def test_state(hass): """Test derivative sensor state.""" diff --git a/tests/components/device_sun_light_trigger/test_init.py b/tests/components/device_sun_light_trigger/test_init.py index 4879be9d18c..7d478e7d8d1 100644 --- a/tests/components/device_sun_light_trigger/test_init.py +++ b/tests/components/device_sun_light_trigger/test_init.py @@ -1,6 +1,7 @@ """The tests device sun light trigger component.""" # pylint: disable=protected-access from datetime import datetime +from unittest.mock import patch import pytest @@ -24,7 +25,6 @@ from homeassistant.core import CoreState from homeassistant.setup import async_setup_component from homeassistant.util import dt as dt_util -from tests.async_mock import patch from tests.common import async_fire_time_changed diff --git a/tests/components/device_tracker/test_init.py b/tests/components/device_tracker/test_init.py index 9424ed229b5..c7aba405ccd 100644 --- a/tests/components/device_tracker/test_init.py +++ b/tests/components/device_tracker/test_init.py @@ -3,6 +3,7 @@ from datetime import datetime, timedelta import json import logging import os +from unittest.mock import Mock, call, patch import pytest @@ -27,7 +28,6 @@ from homeassistant.helpers.json import JSONEncoder from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import Mock, call, patch from tests.common import ( assert_setup_component, async_fire_time_changed, diff --git a/tests/components/devolo_home_control/test_config_flow.py b/tests/components/devolo_home_control/test_config_flow.py index 060188d65aa..dd856d2e6b5 100644 --- a/tests/components/devolo_home_control/test_config_flow.py +++ b/tests/components/devolo_home_control/test_config_flow.py @@ -1,9 +1,10 @@ """Test the devolo_home_control config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.devolo_home_control.const import DOMAIN from homeassistant.config_entries import SOURCE_USER -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/dexcom/__init__.py b/tests/components/dexcom/__init__.py index 47f6238c7c1..16c6f4b4d45 100644 --- a/tests/components/dexcom/__init__.py +++ b/tests/components/dexcom/__init__.py @@ -1,13 +1,13 @@ """Tests for the Dexcom integration.""" import json +from unittest.mock import patch from pydexcom import GlucoseReading from homeassistant.components.dexcom.const import CONF_SERVER, DOMAIN, SERVER_US from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry, load_fixture CONFIG = { diff --git a/tests/components/dexcom/test_config_flow.py b/tests/components/dexcom/test_config_flow.py index c79e7ca0075..2e1dfbcdee5 100644 --- a/tests/components/dexcom/test_config_flow.py +++ b/tests/components/dexcom/test_config_flow.py @@ -1,11 +1,12 @@ """Test the Dexcom config flow.""" +from unittest.mock import patch + from pydexcom import AccountError, SessionError from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.dexcom.const import DOMAIN, MG_DL, MMOL_L from homeassistant.const import CONF_UNIT_OF_MEASUREMENT, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry from tests.components.dexcom import CONFIG diff --git a/tests/components/dexcom/test_init.py b/tests/components/dexcom/test_init.py index 2cb3ad3bf79..a155450bf26 100644 --- a/tests/components/dexcom/test_init.py +++ b/tests/components/dexcom/test_init.py @@ -1,10 +1,11 @@ """Test the Dexcom config flow.""" +from unittest.mock import patch + from pydexcom import AccountError, SessionError from homeassistant.components.dexcom.const import DOMAIN from homeassistant.config_entries import ENTRY_STATE_LOADED, ENTRY_STATE_NOT_LOADED -from tests.async_mock import patch from tests.common import MockConfigEntry from tests.components.dexcom import CONFIG, init_integration diff --git a/tests/components/dexcom/test_sensor.py b/tests/components/dexcom/test_sensor.py index c9e00398140..15de72e9c95 100644 --- a/tests/components/dexcom/test_sensor.py +++ b/tests/components/dexcom/test_sensor.py @@ -1,5 +1,7 @@ """The sensor tests for the griddy platform.""" +from unittest.mock import patch + from pydexcom import SessionError from homeassistant.components.dexcom.const import MMOL_L @@ -9,7 +11,6 @@ from homeassistant.const import ( STATE_UNKNOWN, ) -from tests.async_mock import patch from tests.components.dexcom import GLUCOSE_READING, init_integration diff --git a/tests/components/directv/test_config_flow.py b/tests/components/directv/test_config_flow.py index 09b76cfb550..3372d48aadb 100644 --- a/tests/components/directv/test_config_flow.py +++ b/tests/components/directv/test_config_flow.py @@ -1,4 +1,6 @@ """Test the DirecTV config flow.""" +from unittest.mock import patch + from aiohttp import ClientError as HTTPClientError from homeassistant.components.directv.const import CONF_RECEIVER_ID, DOMAIN @@ -12,7 +14,6 @@ from homeassistant.data_entry_flow import ( ) from homeassistant.helpers.typing import HomeAssistantType -from tests.async_mock import patch from tests.components.directv import ( HOST, MOCK_SSDP_DISCOVERY_INFO, diff --git a/tests/components/directv/test_media_player.py b/tests/components/directv/test_media_player.py index 11aaad707b7..506cf62a44d 100644 --- a/tests/components/directv/test_media_player.py +++ b/tests/components/directv/test_media_player.py @@ -1,6 +1,7 @@ """The tests for the DirecTV Media player platform.""" from datetime import datetime, timedelta from typing import Optional +from unittest.mock import patch from pytest import fixture @@ -55,7 +56,6 @@ from homeassistant.const import ( from homeassistant.helpers.typing import HomeAssistantType from homeassistant.util import dt as dt_util -from tests.async_mock import patch from tests.components.directv import setup_integration from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/directv/test_remote.py b/tests/components/directv/test_remote.py index b00f62c0e0c..33521958747 100644 --- a/tests/components/directv/test_remote.py +++ b/tests/components/directv/test_remote.py @@ -1,4 +1,6 @@ """The tests for the DirecTV remote platform.""" +from unittest.mock import patch + from homeassistant.components.remote import ( ATTR_COMMAND, DOMAIN as REMOTE_DOMAIN, @@ -7,7 +9,6 @@ from homeassistant.components.remote import ( from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON from homeassistant.helpers.typing import HomeAssistantType -from tests.async_mock import patch from tests.components.directv import setup_integration from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/discovery/test_init.py b/tests/components/discovery/test_init.py index 8003f83d996..fd66e59ef21 100644 --- a/tests/components/discovery/test_init.py +++ b/tests/components/discovery/test_init.py @@ -1,5 +1,5 @@ """The tests for the discovery component.""" -from unittest.mock import MagicMock +from unittest.mock import MagicMock, patch import pytest @@ -9,7 +9,6 @@ from homeassistant.components import discovery from homeassistant.const import EVENT_HOMEASSISTANT_STARTED from homeassistant.util.dt import utcnow -from tests.async_mock import patch from tests.common import async_fire_time_changed, mock_coro # One might consider to "mock" services, but it's easy enough to just use diff --git a/tests/components/doorbird/test_config_flow.py b/tests/components/doorbird/test_config_flow.py index c52388b886c..e94f73239f1 100644 --- a/tests/components/doorbird/test_config_flow.py +++ b/tests/components/doorbird/test_config_flow.py @@ -1,4 +1,5 @@ """Test the DoorBird config flow.""" +from unittest.mock import MagicMock, patch import urllib from homeassistant import config_entries, data_entry_flow, setup @@ -6,7 +7,6 @@ from homeassistant.components.doorbird import CONF_CUSTOM_URL, CONF_TOKEN from homeassistant.components.doorbird.const import CONF_EVENTS, DOMAIN from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry, init_recorder_component VALID_CONFIG = { diff --git a/tests/components/dsmr/conftest.py b/tests/components/dsmr/conftest.py index d57828fdfa4..ab7b3a4d479 100644 --- a/tests/components/dsmr/conftest.py +++ b/tests/components/dsmr/conftest.py @@ -1,5 +1,6 @@ """Common test tools.""" import asyncio +from unittest.mock import MagicMock, patch from dsmr_parser.clients.protocol import DSMRProtocol from dsmr_parser.obis_references import ( @@ -10,8 +11,6 @@ from dsmr_parser.obis_references import ( from dsmr_parser.objects import CosemObject import pytest -from tests.async_mock import MagicMock, patch - @pytest.fixture async def dsmr_connection_fixture(hass): diff --git a/tests/components/dsmr/test_config_flow.py b/tests/components/dsmr/test_config_flow.py index 9ae49419bf4..edb3810e24f 100644 --- a/tests/components/dsmr/test_config_flow.py +++ b/tests/components/dsmr/test_config_flow.py @@ -1,13 +1,13 @@ """Test the DSMR config flow.""" import asyncio from itertools import chain, repeat +from unittest.mock import DEFAULT, AsyncMock, patch import serial from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.dsmr import DOMAIN -from tests.async_mock import DEFAULT, AsyncMock, patch from tests.common import MockConfigEntry SERIAL_DATA = {"serial_id": "12345678", "serial_id_gas": "123456789"} diff --git a/tests/components/dsmr/test_sensor.py b/tests/components/dsmr/test_sensor.py index 76a9a5bb070..dde66c6bfb7 100644 --- a/tests/components/dsmr/test_sensor.py +++ b/tests/components/dsmr/test_sensor.py @@ -9,6 +9,7 @@ import asyncio import datetime from decimal import Decimal from itertools import chain, repeat +from unittest.mock import DEFAULT, MagicMock from homeassistant.components.dsmr.const import DOMAIN from homeassistant.components.dsmr.sensor import DerivativeDSMREntity @@ -20,7 +21,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import DEFAULT, MagicMock from tests.common import MockConfigEntry, patch diff --git a/tests/components/dunehd/test_config_flow.py b/tests/components/dunehd/test_config_flow.py index f2d30b2a8dd..b6e57a71668 100644 --- a/tests/components/dunehd/test_config_flow.py +++ b/tests/components/dunehd/test_config_flow.py @@ -1,10 +1,11 @@ """Define tests for the Dune HD config flow.""" +from unittest.mock import patch + from homeassistant import data_entry_flow from homeassistant.components.dunehd.const import DOMAIN from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER from homeassistant.const import CONF_HOST -from tests.async_mock import patch from tests.common import MockConfigEntry CONFIG_HOSTNAME = {CONF_HOST: "dunehd-host"} diff --git a/tests/components/dynalite/common.py b/tests/components/dynalite/common.py index f72e3f481b6..48ec378689e 100644 --- a/tests/components/dynalite/common.py +++ b/tests/components/dynalite/common.py @@ -1,8 +1,9 @@ """Common functions for tests.""" +from unittest.mock import AsyncMock, Mock, call, patch + from homeassistant.components import dynalite from homeassistant.helpers import entity_registry -from tests.async_mock import AsyncMock, Mock, call, patch from tests.common import MockConfigEntry ATTR_SERVICE = "service" diff --git a/tests/components/dynalite/test_bridge.py b/tests/components/dynalite/test_bridge.py index 8f3210bbcf8..363a9671f59 100644 --- a/tests/components/dynalite/test_bridge.py +++ b/tests/components/dynalite/test_bridge.py @@ -1,6 +1,8 @@ """Test Dynalite bridge.""" +from unittest.mock import AsyncMock, Mock, patch + from dynalite_devices_lib.dynalite_devices import ( CONF_AREA as dyn_CONF_AREA, CONF_PRESET as dyn_CONF_PRESET, @@ -18,7 +20,6 @@ from homeassistant.components.dynalite.const import ( ) from homeassistant.helpers.dispatcher import async_dispatcher_connect -from tests.async_mock import AsyncMock, Mock, patch from tests.common import MockConfigEntry diff --git a/tests/components/dynalite/test_config_flow.py b/tests/components/dynalite/test_config_flow.py index 11b4d6b524c..e21c82d7c20 100644 --- a/tests/components/dynalite/test_config_flow.py +++ b/tests/components/dynalite/test_config_flow.py @@ -1,11 +1,12 @@ """Test Dynalite config flow.""" +from unittest.mock import AsyncMock, patch + import pytest from homeassistant import config_entries from homeassistant.components import dynalite -from tests.async_mock import AsyncMock, patch from tests.common import MockConfigEntry diff --git a/tests/components/dynalite/test_init.py b/tests/components/dynalite/test_init.py index faa75aadef8..d231f82d2f8 100644 --- a/tests/components/dynalite/test_init.py +++ b/tests/components/dynalite/test_init.py @@ -1,6 +1,8 @@ """Test Dynalite __init__.""" +from unittest.mock import call, patch + import pytest from voluptuous import MultipleInvalid @@ -8,7 +10,6 @@ import homeassistant.components.dynalite.const as dynalite from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT, CONF_ROOM from homeassistant.setup import async_setup_component -from tests.async_mock import call, patch from tests.common import MockConfigEntry diff --git a/tests/components/dyson/test_air_quality.py b/tests/components/dyson/test_air_quality.py index ab11a1ad897..06050fb8014 100644 --- a/tests/components/dyson/test_air_quality.py +++ b/tests/components/dyson/test_air_quality.py @@ -1,6 +1,7 @@ """Test the Dyson air quality component.""" import json from unittest import mock +from unittest.mock import patch from libpurecool.dyson_pure_cool import DysonPureCool from libpurecool.dyson_pure_state_v2 import DysonEnvironmentalSensorV2State @@ -18,8 +19,6 @@ from homeassistant.setup import async_setup_component from .common import load_mock_device -from tests.async_mock import patch - def _get_dyson_purecool_device(): """Return a valid device as provided by the Dyson web services.""" diff --git a/tests/components/dyson/test_climate.py b/tests/components/dyson/test_climate.py index c4e4c91087c..484af9d48e8 100644 --- a/tests/components/dyson/test_climate.py +++ b/tests/components/dyson/test_climate.py @@ -1,5 +1,6 @@ """Test the Dyson fan component.""" import json +from unittest.mock import Mock, call, patch from libpurecool.const import ( FanPower, @@ -61,8 +62,6 @@ from homeassistant.setup import async_setup_component from .common import load_mock_device -from tests.async_mock import Mock, call, patch - class MockDysonState(DysonPureHotCoolState): """Mock Dyson state.""" diff --git a/tests/components/dyson/test_fan.py b/tests/components/dyson/test_fan.py index 11770e1f133..8fa75e818ef 100644 --- a/tests/components/dyson/test_fan.py +++ b/tests/components/dyson/test_fan.py @@ -2,6 +2,7 @@ import json import unittest from unittest import mock +from unittest.mock import patch from libpurecool.const import FanMode, FanSpeed, NightMode, Oscillation from libpurecool.dyson_pure_cool import DysonPureCool @@ -27,7 +28,6 @@ from homeassistant.setup import async_setup_component from .common import load_mock_device -from tests.async_mock import patch from tests.common import get_test_home_assistant diff --git a/tests/components/dyson/test_sensor.py b/tests/components/dyson/test_sensor.py index 4acc52743bb..7ad6ab6c2f2 100644 --- a/tests/components/dyson/test_sensor.py +++ b/tests/components/dyson/test_sensor.py @@ -1,6 +1,7 @@ """Test the Dyson sensor(s) component.""" import unittest from unittest import mock +from unittest.mock import patch from libpurecool.dyson_pure_cool import DysonPureCool from libpurecool.dyson_pure_cool_link import DysonPureCoolLink @@ -20,7 +21,6 @@ from homeassistant.setup import async_setup_component from .common import load_mock_device -from tests.async_mock import patch from tests.common import get_test_home_assistant diff --git a/tests/components/eafm/conftest.py b/tests/components/eafm/conftest.py index 7233257f2eb..69bb2258486 100644 --- a/tests/components/eafm/conftest.py +++ b/tests/components/eafm/conftest.py @@ -1,8 +1,8 @@ """eafm fixtures.""" -import pytest +from unittest.mock import patch -from tests.async_mock import patch +import pytest @pytest.fixture() diff --git a/tests/components/eafm/test_config_flow.py b/tests/components/eafm/test_config_flow.py index cd71767104f..8a1e2bd89fc 100644 --- a/tests/components/eafm/test_config_flow.py +++ b/tests/components/eafm/test_config_flow.py @@ -1,11 +1,11 @@ """Tests for eafm config flow.""" +from unittest.mock import patch + import pytest from voluptuous.error import MultipleInvalid from homeassistant.components.eafm import const -from tests.async_mock import patch - async def test_flow_no_discovered_stations(hass, mock_get_stations): """Test config flow discovers no station.""" diff --git a/tests/components/ee_brightbox/test_device_tracker.py b/tests/components/ee_brightbox/test_device_tracker.py index 64f24ec289c..06c3ce0cd1d 100644 --- a/tests/components/ee_brightbox/test_device_tracker.py +++ b/tests/components/ee_brightbox/test_device_tracker.py @@ -1,5 +1,6 @@ """Tests for the EE BrightBox device scanner.""" from datetime import datetime +from unittest.mock import patch from eebrightbox import EEBrightBoxException import pytest @@ -8,8 +9,6 @@ from homeassistant.components.device_tracker import DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_PLATFORM from homeassistant.setup import async_setup_component -from tests.async_mock import patch - def _configure_mock_get_devices(eebrightbox_mock): eebrightbox_instance = eebrightbox_mock.return_value diff --git a/tests/components/elkm1/test_config_flow.py b/tests/components/elkm1/test_config_flow.py index 346d0b65ad2..d73bbe53e9a 100644 --- a/tests/components/elkm1/test_config_flow.py +++ b/tests/components/elkm1/test_config_flow.py @@ -1,10 +1,10 @@ """Test the Elk-M1 Control config flow.""" +from unittest.mock import MagicMock, patch + from homeassistant import config_entries, setup from homeassistant.components.elkm1.const import DOMAIN -from tests.async_mock import MagicMock, patch - def mock_elk(invalid_auth=None, sync_complete=None): """Mock m1lib Elk.""" diff --git a/tests/components/emulated_hue/test_hue_api.py b/tests/components/emulated_hue/test_hue_api.py index 576a464c86a..4d8079b9db9 100644 --- a/tests/components/emulated_hue/test_hue_api.py +++ b/tests/components/emulated_hue/test_hue_api.py @@ -3,6 +3,7 @@ import asyncio from datetime import timedelta from ipaddress import ip_address import json +from unittest.mock import patch from aiohttp.hdrs import CONTENT_TYPE import pytest @@ -50,7 +51,6 @@ from homeassistant.const import ( from homeassistant.core import callback import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import async_fire_time_changed, get_test_instance_port HTTP_SERVER_PORT = get_test_instance_port() diff --git a/tests/components/emulated_hue/test_init.py b/tests/components/emulated_hue/test_init.py index b1cf2aacb1b..6fa6d969539 100644 --- a/tests/components/emulated_hue/test_init.py +++ b/tests/components/emulated_hue/test_init.py @@ -1,7 +1,7 @@ """Test the Emulated Hue component.""" -from homeassistant.components.emulated_hue import Config +from unittest.mock import MagicMock, Mock, patch -from tests.async_mock import MagicMock, Mock, patch +from homeassistant.components.emulated_hue import Config def test_config_google_home_entity_id_to_number(): diff --git a/tests/components/emulated_kasa/test_init.py b/tests/components/emulated_kasa/test_init.py index 10ccb4d68a5..60f4f5be1db 100644 --- a/tests/components/emulated_kasa/test_init.py +++ b/tests/components/emulated_kasa/test_init.py @@ -1,5 +1,6 @@ """Tests for emulated_kasa library bindings.""" import math +from unittest.mock import AsyncMock, Mock, patch from homeassistant.components import emulated_kasa from homeassistant.components.emulated_kasa.const import ( @@ -29,8 +30,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock, Mock, patch - ENTITY_SWITCH = "switch.ac" ENTITY_SWITCH_NAME = "A/C" ENTITY_SWITCH_POWER = 400.0 diff --git a/tests/components/emulated_roku/test_binding.py b/tests/components/emulated_roku/test_binding.py index 5ff29194adf..5afee6f6cc3 100644 --- a/tests/components/emulated_roku/test_binding.py +++ b/tests/components/emulated_roku/test_binding.py @@ -1,4 +1,6 @@ """Tests for emulated_roku library bindings.""" +from unittest.mock import AsyncMock, Mock, patch + from homeassistant.components.emulated_roku.binding import ( ATTR_APP_ID, ATTR_COMMAND_TYPE, @@ -12,8 +14,6 @@ from homeassistant.components.emulated_roku.binding import ( EmulatedRoku, ) -from tests.async_mock import AsyncMock, Mock, patch - async def test_events_fired_properly(hass): """Test that events are fired correctly.""" diff --git a/tests/components/emulated_roku/test_init.py b/tests/components/emulated_roku/test_init.py index 92952a5d840..8f256ee4c79 100644 --- a/tests/components/emulated_roku/test_init.py +++ b/tests/components/emulated_roku/test_init.py @@ -1,9 +1,9 @@ """Test emulated_roku component setup process.""" +from unittest.mock import AsyncMock, Mock, patch + from homeassistant.components import emulated_roku from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock, Mock, patch - async def test_config_required_fields(hass): """Test that configuration is successful with required fields.""" diff --git a/tests/components/enocean/test_config_flow.py b/tests/components/enocean/test_config_flow.py index b815d48694a..4cea2a4fb9b 100644 --- a/tests/components/enocean/test_config_flow.py +++ b/tests/components/enocean/test_config_flow.py @@ -1,10 +1,11 @@ """Tests for EnOcean config flow.""" +from unittest.mock import Mock, patch + from homeassistant import data_entry_flow from homeassistant.components.enocean.config_flow import EnOceanFlowHandler from homeassistant.components.enocean.const import DOMAIN from homeassistant.const import CONF_DEVICE -from tests.async_mock import Mock, patch from tests.common import MockConfigEntry DONGLE_VALIDATE_PATH_METHOD = "homeassistant.components.enocean.dongle.validate_path" diff --git a/tests/components/epson/test_config_flow.py b/tests/components/epson/test_config_flow.py index 6faaa285a2a..4a0b9f9675f 100644 --- a/tests/components/epson/test_config_flow.py +++ b/tests/components/epson/test_config_flow.py @@ -1,10 +1,10 @@ """Test the epson config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, setup from homeassistant.components.epson.const import DOMAIN from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT, STATE_UNAVAILABLE -from tests.async_mock import patch - async def test_form(hass): """Test we get the form.""" diff --git a/tests/components/esphome/test_config_flow.py b/tests/components/esphome/test_config_flow.py index 41c3d6cf528..f3afce0d43b 100644 --- a/tests/components/esphome/test_config_flow.py +++ b/tests/components/esphome/test_config_flow.py @@ -1,5 +1,6 @@ """Test config flow.""" from collections import namedtuple +from unittest.mock import AsyncMock, MagicMock, patch import pytest @@ -11,7 +12,6 @@ from homeassistant.data_entry_flow import ( RESULT_TYPE_FORM, ) -from tests.async_mock import AsyncMock, MagicMock, patch from tests.common import MockConfigEntry MockDeviceInfo = namedtuple("DeviceInfo", ["uses_password", "name"]) diff --git a/tests/components/facebox/test_image_processing.py b/tests/components/facebox/test_image_processing.py index 00ce7af0d01..b0e482a89f5 100644 --- a/tests/components/facebox/test_image_processing.py +++ b/tests/components/facebox/test_image_processing.py @@ -1,4 +1,6 @@ """The tests for the facebox component.""" +from unittest.mock import Mock, mock_open, patch + import pytest import requests import requests_mock @@ -21,8 +23,6 @@ from homeassistant.const import ( from homeassistant.core import callback from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, mock_open, patch - MOCK_IP = "192.168.0.1" MOCK_PORT = "8080" diff --git a/tests/components/fail2ban/test_sensor.py b/tests/components/fail2ban/test_sensor.py index 09daee423aa..e43064c54ab 100644 --- a/tests/components/fail2ban/test_sensor.py +++ b/tests/components/fail2ban/test_sensor.py @@ -1,4 +1,6 @@ """The tests for local file sensor platform.""" +from unittest.mock import Mock, mock_open, patch + from homeassistant.components.fail2ban.sensor import ( STATE_ALL_BANS, STATE_CURRENT_BANS, @@ -7,7 +9,6 @@ from homeassistant.components.fail2ban.sensor import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, mock_open, patch from tests.common import assert_setup_component diff --git a/tests/components/feedreader/test_init.py b/tests/components/feedreader/test_init.py index b50ef5f6619..307ba577de3 100644 --- a/tests/components/feedreader/test_init.py +++ b/tests/components/feedreader/test_init.py @@ -6,6 +6,7 @@ from os.path import exists import time import unittest from unittest import mock +from unittest.mock import patch from homeassistant.components import feedreader from homeassistant.components.feedreader import ( @@ -21,7 +22,6 @@ from homeassistant.const import CONF_SCAN_INTERVAL, EVENT_HOMEASSISTANT_START from homeassistant.core import callback from homeassistant.setup import setup_component -from tests.async_mock import patch from tests.common import get_test_home_assistant, load_fixture _LOGGER = getLogger(__name__) diff --git a/tests/components/ffmpeg/test_init.py b/tests/components/ffmpeg/test_init.py index 4187fe561cc..3c6a2fbb92d 100644 --- a/tests/components/ffmpeg/test_init.py +++ b/tests/components/ffmpeg/test_init.py @@ -1,4 +1,6 @@ """The tests for Home Assistant ffmpeg.""" +from unittest.mock import MagicMock + import homeassistant.components.ffmpeg as ffmpeg from homeassistant.components.ffmpeg import ( DOMAIN, @@ -10,7 +12,6 @@ from homeassistant.const import ATTR_ENTITY_ID from homeassistant.core import callback from homeassistant.setup import async_setup_component, setup_component -from tests.async_mock import MagicMock from tests.common import assert_setup_component, get_test_home_assistant diff --git a/tests/components/fido/test_sensor.py b/tests/components/fido/test_sensor.py index 551a59f0788..3baaf2e350c 100644 --- a/tests/components/fido/test_sensor.py +++ b/tests/components/fido/test_sensor.py @@ -1,12 +1,12 @@ """The test for the fido sensor platform.""" import logging +from unittest.mock import MagicMock, patch from pyfido.client import PyFidoError from homeassistant.bootstrap import async_setup_component from homeassistant.components.fido import sensor as fido -from tests.async_mock import MagicMock, patch from tests.common import assert_setup_component CONTRACT = "123456789" diff --git a/tests/components/file/test_notify.py b/tests/components/file/test_notify.py index 5bb387ea1e3..d2db5d9e8a8 100644 --- a/tests/components/file/test_notify.py +++ b/tests/components/file/test_notify.py @@ -1,5 +1,6 @@ """The tests for the notify file platform.""" import os +from unittest.mock import call, mock_open, patch import pytest @@ -8,7 +9,6 @@ from homeassistant.components.notify import ATTR_TITLE_DEFAULT from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import call, mock_open, patch from tests.common import assert_setup_component diff --git a/tests/components/file/test_sensor.py b/tests/components/file/test_sensor.py index 31370334f92..99e08362ab7 100644 --- a/tests/components/file/test_sensor.py +++ b/tests/components/file/test_sensor.py @@ -1,10 +1,11 @@ """The tests for local file sensor platform.""" +from unittest.mock import Mock, mock_open, patch + import pytest from homeassistant.const import STATE_UNKNOWN from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, mock_open, patch from tests.common import mock_registry diff --git a/tests/components/filesize/test_sensor.py b/tests/components/filesize/test_sensor.py index 60f6d273ea4..5649a678e3a 100644 --- a/tests/components/filesize/test_sensor.py +++ b/tests/components/filesize/test_sensor.py @@ -1,5 +1,6 @@ """The tests for the filesize sensor.""" import os +from unittest.mock import patch import pytest @@ -9,8 +10,6 @@ from homeassistant.components.filesize.sensor import CONF_FILE_PATHS from homeassistant.const import SERVICE_RELOAD from homeassistant.setup import async_setup_component -from tests.async_mock import patch - TEST_DIR = os.path.join(os.path.dirname(__file__)) TEST_FILE = os.path.join(TEST_DIR, "mock_file_test_filesize.txt") diff --git a/tests/components/filter/test_sensor.py b/tests/components/filter/test_sensor.py index 1c3b4b0d672..417c84e8ea4 100644 --- a/tests/components/filter/test_sensor.py +++ b/tests/components/filter/test_sensor.py @@ -1,6 +1,7 @@ """The test for the data filter sensor platform.""" from datetime import timedelta from os import path +from unittest.mock import patch from pytest import fixture @@ -20,7 +21,6 @@ import homeassistant.core as ha from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import assert_setup_component, async_init_recorder_component diff --git a/tests/components/fireservicerota/test_config_flow.py b/tests/components/fireservicerota/test_config_flow.py index 8ccaae5fbbc..69f37bc3ad4 100644 --- a/tests/components/fireservicerota/test_config_flow.py +++ b/tests/components/fireservicerota/test_config_flow.py @@ -1,11 +1,12 @@ """Test the FireServiceRota config flow.""" +from unittest.mock import patch + from pyfireservicerota import InvalidAuthError from homeassistant import data_entry_flow from homeassistant.components.fireservicerota.const import DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry MOCK_CONF = { diff --git a/tests/components/firmata/test_config_flow.py b/tests/components/firmata/test_config_flow.py index e77f219e320..91db94052cc 100644 --- a/tests/components/firmata/test_config_flow.py +++ b/tests/components/firmata/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Firmata config flow.""" +from unittest.mock import patch + from pymata_express.pymata_express_serial import serial from homeassistant import config_entries, setup @@ -6,8 +8,6 @@ from homeassistant.components.firmata.const import CONF_SERIAL_PORT, DOMAIN from homeassistant.const import CONF_NAME from homeassistant.core import HomeAssistant -from tests.async_mock import patch - async def test_import_cannot_connect_pymata(hass: HomeAssistant) -> None: """Test we fail with an invalid board.""" diff --git a/tests/components/flick_electric/test_config_flow.py b/tests/components/flick_electric/test_config_flow.py index f18daed875f..1890ea9448a 100644 --- a/tests/components/flick_electric/test_config_flow.py +++ b/tests/components/flick_electric/test_config_flow.py @@ -1,5 +1,6 @@ """Test the Flick Electric config flow.""" import asyncio +from unittest.mock import patch from pyflick.authentication import AuthException @@ -7,7 +8,6 @@ from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.flick_electric.const import DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry CONF = {CONF_USERNAME: "test-username", CONF_PASSWORD: "test-password"} diff --git a/tests/components/flo/test_config_flow.py b/tests/components/flo/test_config_flow.py index edc9705b7cd..d26051bbcb2 100644 --- a/tests/components/flo/test_config_flow.py +++ b/tests/components/flo/test_config_flow.py @@ -1,6 +1,7 @@ """Test the flo config flow.""" import json import time +from unittest.mock import patch from homeassistant import config_entries, setup from homeassistant.components.flo.const import DOMAIN @@ -8,8 +9,6 @@ from homeassistant.const import CONTENT_TYPE_JSON from .common import TEST_EMAIL_ADDRESS, TEST_PASSWORD, TEST_TOKEN, TEST_USER_ID -from tests.async_mock import patch - async def test_form(hass, aioclient_mock_fixture): """Test we get the form.""" diff --git a/tests/components/flume/test_config_flow.py b/tests/components/flume/test_config_flow.py index 0afea0a9742..9ae0889d52c 100644 --- a/tests/components/flume/test_config_flow.py +++ b/tests/components/flume/test_config_flow.py @@ -1,4 +1,6 @@ """Test the flume config flow.""" +from unittest.mock import MagicMock, patch + import requests.exceptions from homeassistant import config_entries, setup @@ -10,8 +12,6 @@ from homeassistant.const import ( CONF_USERNAME, ) -from tests.async_mock import MagicMock, patch - def _get_mocked_flume_device_list(): flume_device_list_mock = MagicMock() diff --git a/tests/components/flunearyou/test_config_flow.py b/tests/components/flunearyou/test_config_flow.py index 3681768ccdf..fbed4d2b426 100644 --- a/tests/components/flunearyou/test_config_flow.py +++ b/tests/components/flunearyou/test_config_flow.py @@ -1,4 +1,6 @@ """Define tests for the flunearyou config flow.""" +from unittest.mock import patch + from pyflunearyou.errors import FluNearYouError from homeassistant import data_entry_flow @@ -6,7 +8,6 @@ from homeassistant.components.flunearyou import DOMAIN from homeassistant.config_entries import SOURCE_USER from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/flux/test_switch.py b/tests/components/flux/test_switch.py index be1fcf4c5ee..0d4e4f0595e 100644 --- a/tests/components/flux/test_switch.py +++ b/tests/components/flux/test_switch.py @@ -1,4 +1,6 @@ """The tests for the Flux switch platform.""" +from unittest.mock import patch + import pytest from homeassistant.components import light, switch @@ -13,7 +15,6 @@ from homeassistant.core import State from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import ( assert_setup_component, async_fire_time_changed, diff --git a/tests/components/folder_watcher/test_init.py b/tests/components/folder_watcher/test_init.py index 1123a5907fb..b0a522cb7fc 100644 --- a/tests/components/folder_watcher/test_init.py +++ b/tests/components/folder_watcher/test_init.py @@ -1,11 +1,10 @@ """The tests for the folder_watcher component.""" import os +from unittest.mock import Mock, patch from homeassistant.components import folder_watcher from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, patch - async def test_invalid_path_setup(hass): """Test that an invalid path is not set up.""" diff --git a/tests/components/foobot/test_sensor.py b/tests/components/foobot/test_sensor.py index 9b8a81c96d5..f817b38c98b 100644 --- a/tests/components/foobot/test_sensor.py +++ b/tests/components/foobot/test_sensor.py @@ -2,6 +2,7 @@ import asyncio import re +from unittest.mock import MagicMock import pytest @@ -19,7 +20,6 @@ from homeassistant.const import ( from homeassistant.exceptions import PlatformNotReady from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock from tests.common import load_fixture VALID_CONFIG = { diff --git a/tests/components/forked_daapd/test_config_flow.py b/tests/components/forked_daapd/test_config_flow.py index f655e727667..843aa12a759 100644 --- a/tests/components/forked_daapd/test_config_flow.py +++ b/tests/components/forked_daapd/test_config_flow.py @@ -1,4 +1,6 @@ """The config flow tests for the forked_daapd media player platform.""" +from unittest.mock import AsyncMock, patch + import pytest from homeassistant import data_entry_flow @@ -16,7 +18,6 @@ from homeassistant.config_entries import ( ) from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT -from tests.async_mock import AsyncMock, patch from tests.common import MockConfigEntry SAMPLE_CONFIG = { diff --git a/tests/components/forked_daapd/test_media_player.py b/tests/components/forked_daapd/test_media_player.py index 15755949062..149cbdae4e2 100644 --- a/tests/components/forked_daapd/test_media_player.py +++ b/tests/components/forked_daapd/test_media_player.py @@ -1,5 +1,7 @@ """The media player tests for the forked_daapd media player platform.""" +from unittest.mock import patch + import pytest from homeassistant.components.forked_daapd.const import ( @@ -65,7 +67,6 @@ from homeassistant.const import ( STATE_UNAVAILABLE, ) -from tests.async_mock import patch from tests.common import MockConfigEntry, async_mock_signal TEST_MASTER_ENTITY_NAME = "media_player.forked_daapd_server" diff --git a/tests/components/freebox/conftest.py b/tests/components/freebox/conftest.py index 7581b03ce72..e813469cbbf 100644 --- a/tests/components/freebox/conftest.py +++ b/tests/components/freebox/conftest.py @@ -1,7 +1,7 @@ """Test helpers for Freebox.""" -import pytest +from unittest.mock import patch -from tests.async_mock import patch +import pytest @pytest.fixture(autouse=True) diff --git a/tests/components/freebox/test_config_flow.py b/tests/components/freebox/test_config_flow.py index addb1762df0..f7150df7efc 100644 --- a/tests/components/freebox/test_config_flow.py +++ b/tests/components/freebox/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for the Freebox config flow.""" +from unittest.mock import AsyncMock, patch + from aiofreepybox.exceptions import ( AuthorizationError, HttpRequestError, @@ -11,7 +13,6 @@ from homeassistant.components.freebox.const import DOMAIN from homeassistant.config_entries import SOURCE_DISCOVERY, SOURCE_IMPORT, SOURCE_USER from homeassistant.const import CONF_HOST, CONF_PORT -from tests.async_mock import AsyncMock, patch from tests.common import MockConfigEntry HOST = "myrouter.freeboxos.fr" diff --git a/tests/components/fritzbox/__init__.py b/tests/components/fritzbox/__init__.py index 066b9a30cb3..f19e05b84df 100644 --- a/tests/components/fritzbox/__init__.py +++ b/tests/components/fritzbox/__init__.py @@ -1,9 +1,9 @@ """Tests for the AVM Fritz!Box integration.""" +from unittest.mock import Mock + from homeassistant.components.fritzbox.const import DOMAIN from homeassistant.const import CONF_DEVICES, CONF_HOST, CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import Mock - MOCK_CONFIG = { DOMAIN: { CONF_DEVICES: [ diff --git a/tests/components/fritzbox/conftest.py b/tests/components/fritzbox/conftest.py index 7dcee138382..591c1037525 100644 --- a/tests/components/fritzbox/conftest.py +++ b/tests/components/fritzbox/conftest.py @@ -1,7 +1,7 @@ """Fixtures for the AVM Fritz!Box integration.""" -import pytest +from unittest.mock import Mock, patch -from tests.async_mock import Mock, patch +import pytest @pytest.fixture(name="fritz") diff --git a/tests/components/fritzbox/test_binary_sensor.py b/tests/components/fritzbox/test_binary_sensor.py index b3157a3be33..89c1dea1704 100644 --- a/tests/components/fritzbox/test_binary_sensor.py +++ b/tests/components/fritzbox/test_binary_sensor.py @@ -1,6 +1,7 @@ """Tests for AVM Fritz!Box binary sensor component.""" from datetime import timedelta from unittest import mock +from unittest.mock import Mock from requests.exceptions import HTTPError @@ -18,7 +19,6 @@ import homeassistant.util.dt as dt_util from . import MOCK_CONFIG, FritzDeviceBinarySensorMock -from tests.async_mock import Mock from tests.common import async_fire_time_changed ENTITY_ID = f"{DOMAIN}.fake_name" diff --git a/tests/components/fritzbox/test_climate.py b/tests/components/fritzbox/test_climate.py index 519e3afa31a..627eae5da91 100644 --- a/tests/components/fritzbox/test_climate.py +++ b/tests/components/fritzbox/test_climate.py @@ -1,5 +1,6 @@ """Tests for AVM Fritz!Box climate component.""" from datetime import timedelta +from unittest.mock import Mock, call from requests.exceptions import HTTPError @@ -41,7 +42,6 @@ import homeassistant.util.dt as dt_util from . import MOCK_CONFIG, FritzDeviceClimateMock -from tests.async_mock import Mock, call from tests.common import async_fire_time_changed ENTITY_ID = f"{DOMAIN}.fake_name" diff --git a/tests/components/fritzbox/test_config_flow.py b/tests/components/fritzbox/test_config_flow.py index 41396735441..31a9f89ce48 100644 --- a/tests/components/fritzbox/test_config_flow.py +++ b/tests/components/fritzbox/test_config_flow.py @@ -1,5 +1,6 @@ """Tests for AVM Fritz!Box config flow.""" from unittest import mock +from unittest.mock import Mock, patch from pyfritzhome import LoginError import pytest @@ -16,8 +17,6 @@ from homeassistant.helpers.typing import HomeAssistantType from . import MOCK_CONFIG -from tests.async_mock import Mock, patch - MOCK_USER_DATA = MOCK_CONFIG[DOMAIN][CONF_DEVICES][0] MOCK_SSDP_DATA = { ATTR_SSDP_LOCATION: "https://fake_host:12345/test", diff --git a/tests/components/fritzbox/test_init.py b/tests/components/fritzbox/test_init.py index 55dab3626db..11067c1aa51 100644 --- a/tests/components/fritzbox/test_init.py +++ b/tests/components/fritzbox/test_init.py @@ -1,4 +1,6 @@ """Tests for the AVM Fritz!Box integration.""" +from unittest.mock import Mock, call + from homeassistant.components.fritzbox.const import DOMAIN as FB_DOMAIN from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN from homeassistant.config_entries import ENTRY_STATE_LOADED, ENTRY_STATE_NOT_LOADED @@ -8,7 +10,6 @@ from homeassistant.setup import async_setup_component from . import MOCK_CONFIG, FritzDeviceSwitchMock -from tests.async_mock import Mock, call from tests.common import MockConfigEntry diff --git a/tests/components/fritzbox/test_sensor.py b/tests/components/fritzbox/test_sensor.py index 7f97e8abfb1..6dde22f074e 100644 --- a/tests/components/fritzbox/test_sensor.py +++ b/tests/components/fritzbox/test_sensor.py @@ -1,5 +1,6 @@ """Tests for AVM Fritz!Box sensor component.""" from datetime import timedelta +from unittest.mock import Mock from requests.exceptions import HTTPError @@ -20,7 +21,6 @@ import homeassistant.util.dt as dt_util from . import MOCK_CONFIG, FritzDeviceSensorMock -from tests.async_mock import Mock from tests.common import async_fire_time_changed ENTITY_ID = f"{DOMAIN}.fake_name" diff --git a/tests/components/fritzbox/test_switch.py b/tests/components/fritzbox/test_switch.py index c9e05b2d481..1c0f7b3f37a 100644 --- a/tests/components/fritzbox/test_switch.py +++ b/tests/components/fritzbox/test_switch.py @@ -1,5 +1,6 @@ """Tests for AVM Fritz!Box switch component.""" from datetime import timedelta +from unittest.mock import Mock from requests.exceptions import HTTPError @@ -28,7 +29,6 @@ import homeassistant.util.dt as dt_util from . import MOCK_CONFIG, FritzDeviceSwitchMock -from tests.async_mock import Mock from tests.common import async_fire_time_changed ENTITY_ID = f"{DOMAIN}.fake_name" diff --git a/tests/components/frontend/test_init.py b/tests/components/frontend/test_init.py index 7802ee60e8c..5ae8d707cb1 100644 --- a/tests/components/frontend/test_init.py +++ b/tests/components/frontend/test_init.py @@ -1,6 +1,7 @@ """The tests for Home Assistant frontend.""" from datetime import timedelta import re +from unittest.mock import patch import pytest @@ -19,7 +20,6 @@ from homeassistant.loader import async_get_integration from homeassistant.setup import async_setup_component from homeassistant.util import dt -from tests.async_mock import patch from tests.common import async_capture_events, async_fire_time_changed CONFIG_THEMES = { diff --git a/tests/components/garmin_connect/test_config_flow.py b/tests/components/garmin_connect/test_config_flow.py index 93b24269441..75146570d55 100644 --- a/tests/components/garmin_connect/test_config_flow.py +++ b/tests/components/garmin_connect/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Garmin Connect config flow.""" +from unittest.mock import patch + from garminconnect import ( GarminConnectAuthenticationError, GarminConnectConnectionError, @@ -10,7 +12,6 @@ from homeassistant import data_entry_flow from homeassistant.components.garmin_connect.const import DOMAIN from homeassistant.const import CONF_ID, CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry MOCK_CONF = { diff --git a/tests/components/gdacs/__init__.py b/tests/components/gdacs/__init__.py index 648ab08507b..6e61b86dbb7 100644 --- a/tests/components/gdacs/__init__.py +++ b/tests/components/gdacs/__init__.py @@ -1,5 +1,5 @@ """Tests for the GDACS component.""" -from tests.async_mock import MagicMock +from unittest.mock import MagicMock def _generate_mock_feed_entry( diff --git a/tests/components/gdacs/test_config_flow.py b/tests/components/gdacs/test_config_flow.py index 10e4312eb38..e2ecd3902d5 100644 --- a/tests/components/gdacs/test_config_flow.py +++ b/tests/components/gdacs/test_config_flow.py @@ -1,5 +1,6 @@ """Define tests for the GDACS config flow.""" from datetime import timedelta +from unittest.mock import patch import pytest @@ -12,8 +13,6 @@ from homeassistant.const import ( CONF_SCAN_INTERVAL, ) -from tests.async_mock import patch - @pytest.fixture(name="gdacs_setup", autouse=True) def gdacs_setup_fixture(): diff --git a/tests/components/gdacs/test_geo_location.py b/tests/components/gdacs/test_geo_location.py index 4185a7f656e..7dc23eaa5d8 100644 --- a/tests/components/gdacs/test_geo_location.py +++ b/tests/components/gdacs/test_geo_location.py @@ -1,5 +1,6 @@ """The tests for the GDACS Feed integration.""" import datetime +from unittest.mock import patch from homeassistant.components import gdacs from homeassistant.components.gdacs import DEFAULT_SCAN_INTERVAL, DOMAIN, FEED @@ -33,7 +34,6 @@ from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util from homeassistant.util.unit_system import IMPERIAL_SYSTEM -from tests.async_mock import patch from tests.common import async_fire_time_changed from tests.components.gdacs import _generate_mock_feed_entry diff --git a/tests/components/gdacs/test_init.py b/tests/components/gdacs/test_init.py index c0ac83ebcc2..cf78faf729b 100644 --- a/tests/components/gdacs/test_init.py +++ b/tests/components/gdacs/test_init.py @@ -1,7 +1,7 @@ """Define tests for the GDACS general setup.""" -from homeassistant.components.gdacs import DOMAIN, FEED +from unittest.mock import patch -from tests.async_mock import patch +from homeassistant.components.gdacs import DOMAIN, FEED async def test_component_unload_config_entry(hass, config_entry): diff --git a/tests/components/gdacs/test_sensor.py b/tests/components/gdacs/test_sensor.py index b123021a7e3..ac53d88478b 100644 --- a/tests/components/gdacs/test_sensor.py +++ b/tests/components/gdacs/test_sensor.py @@ -1,4 +1,6 @@ """The tests for the GDACS Feed integration.""" +from unittest.mock import patch + from homeassistant.components import gdacs from homeassistant.components.gdacs import DEFAULT_SCAN_INTERVAL from homeassistant.components.gdacs.sensor import ( @@ -18,7 +20,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import async_fire_time_changed from tests.components.gdacs import _generate_mock_feed_entry diff --git a/tests/components/generic/test_camera.py b/tests/components/generic/test_camera.py index 7be1670dd4c..9a147995541 100644 --- a/tests/components/generic/test_camera.py +++ b/tests/components/generic/test_camera.py @@ -1,6 +1,7 @@ """The tests for generic camera component.""" import asyncio from os import path +from unittest.mock import patch from homeassistant import config as hass_config from homeassistant.components.generic import DOMAIN @@ -12,8 +13,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import patch - async def test_fetching_url(aioclient_mock, hass, hass_client): """Test that it fetches the given url.""" diff --git a/tests/components/generic_thermostat/test_climate.py b/tests/components/generic_thermostat/test_climate.py index 71c6f41282b..201ed0130ff 100644 --- a/tests/components/generic_thermostat/test_climate.py +++ b/tests/components/generic_thermostat/test_climate.py @@ -1,6 +1,7 @@ """The tests for the generic_thermostat.""" import datetime from os import path +from unittest.mock import patch import pytest import pytz @@ -37,7 +38,6 @@ from homeassistant.core import DOMAIN as HASS_DOMAIN, CoreState, State, callback from homeassistant.setup import async_setup_component from homeassistant.util.unit_system import METRIC_SYSTEM -from tests.async_mock import patch from tests.common import ( assert_setup_component, async_fire_time_changed, diff --git a/tests/components/geo_json_events/test_geo_location.py b/tests/components/geo_json_events/test_geo_location.py index d0505cc68d9..75f41bb93c0 100644 --- a/tests/components/geo_json_events/test_geo_location.py +++ b/tests/components/geo_json_events/test_geo_location.py @@ -1,4 +1,6 @@ """The tests for the geojson platform.""" +from unittest.mock import MagicMock, call, patch + from homeassistant.components import geo_location from homeassistant.components.geo_json_events.geo_location import ( ATTR_EXTERNAL_ID, @@ -21,7 +23,6 @@ from homeassistant.helpers.dispatcher import DATA_DISPATCHER from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import MagicMock, call, patch from tests.common import assert_setup_component, async_fire_time_changed URL = "http://geo.json.local/geo_json_events.json" diff --git a/tests/components/geo_rss_events/test_sensor.py b/tests/components/geo_rss_events/test_sensor.py index 8c55b8ad4dd..ead81e5c5a8 100644 --- a/tests/components/geo_rss_events/test_sensor.py +++ b/tests/components/geo_rss_events/test_sensor.py @@ -1,4 +1,6 @@ """The test for the geo rss events sensor platform.""" +from unittest.mock import MagicMock, patch + import pytest from homeassistant.components import sensor @@ -12,7 +14,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import MagicMock, patch from tests.common import assert_setup_component, async_fire_time_changed URL = "http://geo.rss.local/geo_rss_events.xml" diff --git a/tests/components/geofency/test_init.py b/tests/components/geofency/test_init.py index 21b6830e7f4..b87b201a144 100644 --- a/tests/components/geofency/test_init.py +++ b/tests/components/geofency/test_init.py @@ -1,4 +1,7 @@ """The tests for the Geofency device tracker platform.""" +# pylint: disable=redefined-outer-name +from unittest.mock import patch + import pytest from homeassistant import data_entry_flow @@ -16,9 +19,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component from homeassistant.util import slugify -# pylint: disable=redefined-outer-name -from tests.async_mock import patch - HOME_LATITUDE = 37.239622 HOME_LONGITUDE = -115.815811 diff --git a/tests/components/geonetnz_quakes/__init__.py b/tests/components/geonetnz_quakes/__init__.py index 82cb62b3939..424c6372ea8 100644 --- a/tests/components/geonetnz_quakes/__init__.py +++ b/tests/components/geonetnz_quakes/__init__.py @@ -1,5 +1,5 @@ """Tests for the geonetnz_quakes component.""" -from tests.async_mock import MagicMock +from unittest.mock import MagicMock def _generate_mock_feed_entry( diff --git a/tests/components/geonetnz_quakes/test_config_flow.py b/tests/components/geonetnz_quakes/test_config_flow.py index a4b1d9c792b..d362e9cdf0f 100644 --- a/tests/components/geonetnz_quakes/test_config_flow.py +++ b/tests/components/geonetnz_quakes/test_config_flow.py @@ -1,5 +1,6 @@ """Define tests for the GeoNet NZ Quakes config flow.""" from datetime import timedelta +from unittest.mock import patch from homeassistant import data_entry_flow from homeassistant.components.geonetnz_quakes import ( @@ -15,8 +16,6 @@ from homeassistant.const import ( CONF_UNIT_SYSTEM, ) -from tests.async_mock import patch - async def test_duplicate_error(hass, config_entry): """Test that errors are shown when duplicates are added.""" diff --git a/tests/components/geonetnz_quakes/test_geo_location.py b/tests/components/geonetnz_quakes/test_geo_location.py index 2622cd100b3..b0e54e89929 100644 --- a/tests/components/geonetnz_quakes/test_geo_location.py +++ b/tests/components/geonetnz_quakes/test_geo_location.py @@ -1,5 +1,6 @@ """The tests for the GeoNet NZ Quakes Feed integration.""" import datetime +from unittest.mock import patch from homeassistant.components import geonetnz_quakes from homeassistant.components.geo_location import ATTR_SOURCE @@ -29,7 +30,6 @@ from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util from homeassistant.util.unit_system import IMPERIAL_SYSTEM -from tests.async_mock import patch from tests.common import async_fire_time_changed from tests.components.geonetnz_quakes import _generate_mock_feed_entry diff --git a/tests/components/geonetnz_quakes/test_init.py b/tests/components/geonetnz_quakes/test_init.py index 87f2f2a7947..e8a1dc1e380 100644 --- a/tests/components/geonetnz_quakes/test_init.py +++ b/tests/components/geonetnz_quakes/test_init.py @@ -1,7 +1,7 @@ """Define tests for the GeoNet NZ Quakes general setup.""" -from homeassistant.components.geonetnz_quakes import DOMAIN, FEED +from unittest.mock import patch -from tests.async_mock import patch +from homeassistant.components.geonetnz_quakes import DOMAIN, FEED async def test_component_unload_config_entry(hass, config_entry): diff --git a/tests/components/geonetnz_quakes/test_sensor.py b/tests/components/geonetnz_quakes/test_sensor.py index 5a6e675471a..8226fd91898 100644 --- a/tests/components/geonetnz_quakes/test_sensor.py +++ b/tests/components/geonetnz_quakes/test_sensor.py @@ -1,5 +1,6 @@ """The tests for the GeoNet NZ Quakes Feed integration.""" import datetime +from unittest.mock import patch from homeassistant.components import geonetnz_quakes from homeassistant.components.geonetnz_quakes import DEFAULT_SCAN_INTERVAL @@ -20,7 +21,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import async_fire_time_changed from tests.components.geonetnz_quakes import _generate_mock_feed_entry diff --git a/tests/components/geonetnz_volcano/__init__.py b/tests/components/geonetnz_volcano/__init__.py index 023cab46ec8..708b69e0031 100644 --- a/tests/components/geonetnz_volcano/__init__.py +++ b/tests/components/geonetnz_volcano/__init__.py @@ -1,5 +1,5 @@ """The tests for the GeoNet NZ Volcano Feed integration.""" -from tests.async_mock import MagicMock +from unittest.mock import MagicMock def _generate_mock_feed_entry( diff --git a/tests/components/geonetnz_volcano/test_config_flow.py b/tests/components/geonetnz_volcano/test_config_flow.py index 21d74bb5e96..92c25e00927 100644 --- a/tests/components/geonetnz_volcano/test_config_flow.py +++ b/tests/components/geonetnz_volcano/test_config_flow.py @@ -1,5 +1,6 @@ """Define tests for the GeoNet NZ Volcano config flow.""" from datetime import timedelta +from unittest.mock import patch from homeassistant import data_entry_flow from homeassistant.components.geonetnz_volcano import config_flow @@ -11,8 +12,6 @@ from homeassistant.const import ( CONF_UNIT_SYSTEM, ) -from tests.async_mock import patch - async def test_duplicate_error(hass, config_entry): """Test that errors are shown when duplicates are added.""" diff --git a/tests/components/geonetnz_volcano/test_init.py b/tests/components/geonetnz_volcano/test_init.py index 4edf8f452fe..42915f7feaa 100644 --- a/tests/components/geonetnz_volcano/test_init.py +++ b/tests/components/geonetnz_volcano/test_init.py @@ -1,7 +1,7 @@ """Define tests for the GeoNet NZ Volcano general setup.""" -from homeassistant.components.geonetnz_volcano import DOMAIN, FEED +from unittest.mock import AsyncMock, patch -from tests.async_mock import AsyncMock, patch +from homeassistant.components.geonetnz_volcano import DOMAIN, FEED async def test_component_unload_config_entry(hass, config_entry): diff --git a/tests/components/geonetnz_volcano/test_sensor.py b/tests/components/geonetnz_volcano/test_sensor.py index 22157c241ac..824fc059ace 100644 --- a/tests/components/geonetnz_volcano/test_sensor.py +++ b/tests/components/geonetnz_volcano/test_sensor.py @@ -1,4 +1,6 @@ """The tests for the GeoNet NZ Volcano Feed integration.""" +from unittest.mock import AsyncMock, patch + from homeassistant.components import geonetnz_volcano from homeassistant.components.geo_location import ATTR_DISTANCE from homeassistant.components.geonetnz_volcano import DEFAULT_SCAN_INTERVAL @@ -21,7 +23,6 @@ from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util from homeassistant.util.unit_system import IMPERIAL_SYSTEM -from tests.async_mock import AsyncMock, patch from tests.common import async_fire_time_changed from tests.components.geonetnz_volcano import _generate_mock_feed_entry diff --git a/tests/components/gios/__init__.py b/tests/components/gios/__init__.py index 920461a6ae1..6b1aa982c71 100644 --- a/tests/components/gios/__init__.py +++ b/tests/components/gios/__init__.py @@ -1,9 +1,9 @@ """Tests for GIOS.""" import json +from unittest.mock import patch from homeassistant.components.gios.const import DOMAIN -from tests.async_mock import patch from tests.common import MockConfigEntry, load_fixture STATIONS = [ diff --git a/tests/components/gios/test_air_quality.py b/tests/components/gios/test_air_quality.py index 9a5b1be6a20..21a1abf637a 100644 --- a/tests/components/gios/test_air_quality.py +++ b/tests/components/gios/test_air_quality.py @@ -1,6 +1,7 @@ """Test air_quality of GIOS integration.""" from datetime import timedelta import json +from unittest.mock import patch from gios import ApiError @@ -24,7 +25,6 @@ from homeassistant.const import ( ) from homeassistant.util.dt import utcnow -from tests.async_mock import patch from tests.common import async_fire_time_changed, load_fixture from tests.components.gios import init_integration diff --git a/tests/components/gios/test_config_flow.py b/tests/components/gios/test_config_flow.py index 24ada20aded..830b3a198a5 100644 --- a/tests/components/gios/test_config_flow.py +++ b/tests/components/gios/test_config_flow.py @@ -1,5 +1,6 @@ """Define tests for the GIOS config flow.""" import json +from unittest.mock import patch from gios import ApiError @@ -8,7 +9,6 @@ from homeassistant.components.gios import config_flow from homeassistant.components.gios.const import CONF_STATION_ID from homeassistant.const import CONF_NAME -from tests.async_mock import patch from tests.common import load_fixture from tests.components.gios import STATIONS diff --git a/tests/components/gios/test_init.py b/tests/components/gios/test_init.py index 0846ddfb4ca..344afe4e047 100644 --- a/tests/components/gios/test_init.py +++ b/tests/components/gios/test_init.py @@ -1,4 +1,6 @@ """Test init of GIOS integration.""" +from unittest.mock import patch + from homeassistant.components.gios.const import DOMAIN from homeassistant.config_entries import ( ENTRY_STATE_LOADED, @@ -7,7 +9,6 @@ from homeassistant.config_entries import ( ) from homeassistant.const import STATE_UNAVAILABLE -from tests.async_mock import patch from tests.common import MockConfigEntry from tests.components.gios import init_integration diff --git a/tests/components/goalzero/__init__.py b/tests/components/goalzero/__init__.py index 0ba2a912766..fb531dfca4b 100644 --- a/tests/components/goalzero/__init__.py +++ b/tests/components/goalzero/__init__.py @@ -1,8 +1,8 @@ """Tests for the Goal Zero Yeti integration.""" -from homeassistant.const import CONF_HOST, CONF_NAME +from unittest.mock import AsyncMock, patch -from tests.async_mock import AsyncMock, patch +from homeassistant.const import CONF_HOST, CONF_NAME HOST = "1.2.3.4" NAME = "Yeti" diff --git a/tests/components/goalzero/test_config_flow.py b/tests/components/goalzero/test_config_flow.py index 906a84d7882..10ef02bfcff 100644 --- a/tests/components/goalzero/test_config_flow.py +++ b/tests/components/goalzero/test_config_flow.py @@ -1,4 +1,6 @@ """Test Goal Zero Yeti config flow.""" +from unittest.mock import patch + from goalzero import exceptions from homeassistant.components.goalzero.const import DOMAIN @@ -19,7 +21,6 @@ from . import ( _patch_config_flow_yeti, ) -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/gogogate2/test_config_flow.py b/tests/components/gogogate2/test_config_flow.py index 667c0330d80..ba8a119553c 100644 --- a/tests/components/gogogate2/test_config_flow.py +++ b/tests/components/gogogate2/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for the GogoGate2 component.""" +from unittest.mock import MagicMock, patch + from gogogate2_api import GogoGate2Api from gogogate2_api.common import ApiError from gogogate2_api.const import GogoGate2ApiErrorCode @@ -19,7 +21,6 @@ from homeassistant.const import ( from homeassistant.core import HomeAssistant from homeassistant.data_entry_flow import RESULT_TYPE_ABORT, RESULT_TYPE_FORM -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry MOCK_MAC_ADDR = "AA:BB:CC:DD:EE:FF" diff --git a/tests/components/gogogate2/test_cover.py b/tests/components/gogogate2/test_cover.py index 91bffca56ce..7a944d3f7f1 100644 --- a/tests/components/gogogate2/test_cover.py +++ b/tests/components/gogogate2/test_cover.py @@ -1,5 +1,6 @@ """Tests for the GogoGate2 component.""" from datetime import timedelta +from unittest.mock import MagicMock, patch from gogogate2_api import GogoGate2Api, ISmartGateApi from gogogate2_api.common import ( @@ -49,7 +50,6 @@ from homeassistant.core import HomeAssistant from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry, async_fire_time_changed, mock_device_registry diff --git a/tests/components/gogogate2/test_init.py b/tests/components/gogogate2/test_init.py index af8678300d1..d76108a9221 100644 --- a/tests/components/gogogate2/test_init.py +++ b/tests/components/gogogate2/test_init.py @@ -1,4 +1,6 @@ """Tests for the GogoGate2 component.""" +from unittest.mock import MagicMock, patch + from gogogate2_api import GogoGate2Api import pytest @@ -15,7 +17,6 @@ from homeassistant.const import ( from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryNotReady -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry diff --git a/tests/components/google/conftest.py b/tests/components/google/conftest.py index 6ec75ad53f6..20cb13130ec 100644 --- a/tests/components/google/conftest.py +++ b/tests/components/google/conftest.py @@ -1,7 +1,7 @@ """Test configuration and mocks for the google integration.""" -import pytest +from unittest.mock import patch -from tests.async_mock import patch +import pytest TEST_CALENDAR = { "id": "qwertyuiopasdfghjklzxcvbnm@import.calendar.google.com", diff --git a/tests/components/google/test_calendar.py b/tests/components/google/test_calendar.py index 92f03396965..ad7b6b12001 100644 --- a/tests/components/google/test_calendar.py +++ b/tests/components/google/test_calendar.py @@ -1,5 +1,6 @@ """The tests for the google calendar platform.""" import copy +from unittest.mock import Mock, patch import httplib2 import pytest @@ -22,7 +23,6 @@ from homeassistant.setup import async_setup_component from homeassistant.util import slugify import homeassistant.util.dt as dt_util -from tests.async_mock import Mock, patch from tests.common import async_mock_service GOOGLE_CONFIG = {CONF_CLIENT_ID: "client_id", CONF_CLIENT_SECRET: "client_secret"} diff --git a/tests/components/google/test_init.py b/tests/components/google/test_init.py index e3412a01f5e..d90efa29f6c 100644 --- a/tests/components/google/test_init.py +++ b/tests/components/google/test_init.py @@ -1,12 +1,12 @@ """The tests for the Google Calendar component.""" +from unittest.mock import patch + import pytest import homeassistant.components.google as google from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET from homeassistant.setup import async_setup_component -from tests.async_mock import patch - @pytest.fixture(name="google_setup") def mock_google_setup(hass): diff --git a/tests/components/google_assistant/__init__.py b/tests/components/google_assistant/__init__.py index bbc5b92615c..5927ee83d25 100644 --- a/tests/components/google_assistant/__init__.py +++ b/tests/components/google_assistant/__init__.py @@ -1,7 +1,7 @@ """Tests for the Google Assistant integration.""" -from homeassistant.components.google_assistant import helpers +from unittest.mock import MagicMock -from tests.async_mock import MagicMock +from homeassistant.components.google_assistant import helpers def mock_google_config_store(agent_user_ids=None): diff --git a/tests/components/google_assistant/test_helpers.py b/tests/components/google_assistant/test_helpers.py index 87e3cac657c..abf2773d67e 100644 --- a/tests/components/google_assistant/test_helpers.py +++ b/tests/components/google_assistant/test_helpers.py @@ -1,5 +1,6 @@ """Test Google Assistant helpers.""" from datetime import timedelta +from unittest.mock import Mock, call, patch import pytest @@ -15,7 +16,6 @@ from homeassistant.util import dt from . import MockConfig -from tests.async_mock import Mock, call, patch from tests.common import ( async_capture_events, async_fire_time_changed, diff --git a/tests/components/google_assistant/test_http.py b/tests/components/google_assistant/test_http.py index 4b9461e6304..69a8242b7cc 100644 --- a/tests/components/google_assistant/test_http.py +++ b/tests/components/google_assistant/test_http.py @@ -1,5 +1,6 @@ """Test Google http services.""" from datetime import datetime, timedelta, timezone +from unittest.mock import ANY, patch from homeassistant.components.google_assistant import GOOGLE_ASSISTANT_SCHEMA from homeassistant.components.google_assistant.const import ( @@ -12,8 +13,6 @@ from homeassistant.components.google_assistant.http import ( _get_homegraph_token, ) -from tests.async_mock import ANY, patch - DUMMY_CONFIG = GOOGLE_ASSISTANT_SCHEMA( { "project_id": "1234", diff --git a/tests/components/google_assistant/test_report_state.py b/tests/components/google_assistant/test_report_state.py index cd967e6c82e..4ab206edb90 100644 --- a/tests/components/google_assistant/test_report_state.py +++ b/tests/components/google_assistant/test_report_state.py @@ -1,10 +1,11 @@ """Test Google report state.""" +from unittest.mock import AsyncMock, patch + from homeassistant.components.google_assistant import error, report_state from homeassistant.util.dt import utcnow from . import BASIC_CONFIG -from tests.async_mock import AsyncMock, patch from tests.common import async_fire_time_changed diff --git a/tests/components/google_assistant/test_smart_home.py b/tests/components/google_assistant/test_smart_home.py index ebe34c2aa95..5739370b187 100644 --- a/tests/components/google_assistant/test_smart_home.py +++ b/tests/components/google_assistant/test_smart_home.py @@ -1,4 +1,6 @@ """Test Google Smart Home.""" +from unittest.mock import patch + import pytest from homeassistant.components import camera @@ -28,7 +30,6 @@ from homeassistant.setup import async_setup_component from . import BASIC_CONFIG, MockConfig -from tests.async_mock import patch from tests.common import mock_area_registry, mock_device_registry, mock_registry REQ_ID = "ff36a3cc-ec34-11e6-b1a0-64510650abcf" diff --git a/tests/components/google_assistant/test_trait.py b/tests/components/google_assistant/test_trait.py index 4946416e1c8..b7034f927b4 100644 --- a/tests/components/google_assistant/test_trait.py +++ b/tests/components/google_assistant/test_trait.py @@ -1,5 +1,6 @@ """Tests for the Google Assistant traits.""" from datetime import datetime, timedelta +from unittest.mock import patch import pytest @@ -53,7 +54,6 @@ from homeassistant.util import color from . import BASIC_CONFIG, MockConfig -from tests.async_mock import patch from tests.common import async_mock_service REQ_ID = "ff36a3cc-ec34-11e6-b1a0-64510650abcf" diff --git a/tests/components/google_pubsub/test_init.py b/tests/components/google_pubsub/test_init.py index 96be5b3ed62..c174e454701 100644 --- a/tests/components/google_pubsub/test_init.py +++ b/tests/components/google_pubsub/test_init.py @@ -1,6 +1,7 @@ """The tests for the Google Pub/Sub component.""" from dataclasses import dataclass from datetime import datetime +import unittest.mock as mock import pytest @@ -10,8 +11,6 @@ from homeassistant.const import EVENT_STATE_CHANGED from homeassistant.core import split_entity_id from homeassistant.setup import async_setup_component -import tests.async_mock as mock - GOOGLE_PUBSUB_PATH = "homeassistant.components.google_pubsub" diff --git a/tests/components/google_translate/test_tts.py b/tests/components/google_translate/test_tts.py index 79c303fd2ff..5690591ccd2 100644 --- a/tests/components/google_translate/test_tts.py +++ b/tests/components/google_translate/test_tts.py @@ -1,6 +1,7 @@ """The tests for the Google speech platform.""" import os import shutil +from unittest.mock import patch from gtts import gTTSError import pytest @@ -14,7 +15,6 @@ import homeassistant.components.tts as tts from homeassistant.config import async_process_ha_core_config from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import async_mock_service from tests.components.tts.test_init import mutagen_mock # noqa: F401 diff --git a/tests/components/google_wifi/test_sensor.py b/tests/components/google_wifi/test_sensor.py index a9e09c8b66d..06ad5e0c3ea 100644 --- a/tests/components/google_wifi/test_sensor.py +++ b/tests/components/google_wifi/test_sensor.py @@ -1,12 +1,12 @@ """The tests for the Google Wifi platform.""" from datetime import datetime, timedelta +from unittest.mock import Mock, patch import homeassistant.components.google_wifi.sensor as google_wifi from homeassistant.const import STATE_UNKNOWN from homeassistant.setup import async_setup_component from homeassistant.util import dt as dt_util -from tests.async_mock import Mock, patch from tests.common import assert_setup_component, async_fire_time_changed NAME = "foo" diff --git a/tests/components/gpslogger/test_init.py b/tests/components/gpslogger/test_init.py index 39dc05303b3..d30f57f0f33 100644 --- a/tests/components/gpslogger/test_init.py +++ b/tests/components/gpslogger/test_init.py @@ -1,4 +1,6 @@ """The tests the for GPSLogger device tracker platform.""" +from unittest.mock import patch + import pytest from homeassistant import data_entry_flow @@ -15,8 +17,6 @@ from homeassistant.const import ( from homeassistant.helpers.dispatcher import DATA_DISPATCHER from homeassistant.setup import async_setup_component -from tests.async_mock import patch - HOME_LATITUDE = 37.239622 HOME_LONGITUDE = -115.815811 diff --git a/tests/components/graphite/test_init.py b/tests/components/graphite/test_init.py index 19b8c165f37..88be3723936 100644 --- a/tests/components/graphite/test_init.py +++ b/tests/components/graphite/test_init.py @@ -2,6 +2,7 @@ import socket import unittest from unittest import mock +from unittest.mock import patch import homeassistant.components.graphite as graphite from homeassistant.const import ( @@ -14,7 +15,6 @@ from homeassistant.const import ( import homeassistant.core as ha from homeassistant.setup import setup_component -from tests.async_mock import patch from tests.common import get_test_home_assistant diff --git a/tests/components/gree/common.py b/tests/components/gree/common.py index 8894730c8ca..d9fcfba39ce 100644 --- a/tests/components/gree/common.py +++ b/tests/components/gree/common.py @@ -1,5 +1,5 @@ """Common helpers for gree test cases.""" -from tests.async_mock import AsyncMock, Mock +from unittest.mock import AsyncMock, Mock def build_device_info_mock( diff --git a/tests/components/gree/conftest.py b/tests/components/gree/conftest.py index b102f0f36fe..bc9a6451dce 100644 --- a/tests/components/gree/conftest.py +++ b/tests/components/gree/conftest.py @@ -1,10 +1,10 @@ """Pytest module configuration.""" +from unittest.mock import AsyncMock, patch + import pytest from .common import build_device_info_mock, build_device_mock -from tests.async_mock import AsyncMock, patch - @pytest.fixture(name="discovery") def discovery_fixture(): diff --git a/tests/components/gree/test_climate.py b/tests/components/gree/test_climate.py index cfb689589bf..d85976c2410 100644 --- a/tests/components/gree/test_climate.py +++ b/tests/components/gree/test_climate.py @@ -1,5 +1,6 @@ """Tests for gree component.""" from datetime import timedelta +from unittest.mock import DEFAULT as DEFAULT_MOCK, AsyncMock, patch from greeclimate.device import HorizontalSwing, VerticalSwing from greeclimate.exceptions import DeviceNotBoundError, DeviceTimeoutError @@ -60,7 +61,6 @@ import homeassistant.util.dt as dt_util from .common import build_device_mock -from tests.async_mock import DEFAULT as DEFAULT_MOCK, AsyncMock, patch from tests.common import MockConfigEntry, async_fire_time_changed ENTITY_ID = f"{DOMAIN}.fake_device_1" diff --git a/tests/components/gree/test_init.py b/tests/components/gree/test_init.py index ef693c9538a..bf999ee9e6f 100644 --- a/tests/components/gree/test_init.py +++ b/tests/components/gree/test_init.py @@ -1,10 +1,11 @@ """Tests for the Gree Integration.""" +from unittest.mock import patch + from homeassistant.components.gree.const import DOMAIN as GREE_DOMAIN from homeassistant.config_entries import ENTRY_STATE_LOADED, ENTRY_STATE_NOT_LOADED from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/griddy/test_config_flow.py b/tests/components/griddy/test_config_flow.py index 0b2656dcf09..cfc2b23a8ed 100644 --- a/tests/components/griddy/test_config_flow.py +++ b/tests/components/griddy/test_config_flow.py @@ -1,11 +1,10 @@ """Test the Griddy Power config flow.""" import asyncio +from unittest.mock import MagicMock, patch from homeassistant import config_entries, setup from homeassistant.components.griddy.const import DOMAIN -from tests.async_mock import MagicMock, patch - async def test_form(hass): """Test we get the form.""" diff --git a/tests/components/griddy/test_sensor.py b/tests/components/griddy/test_sensor.py index ae3d0c3be84..46f8d238c49 100644 --- a/tests/components/griddy/test_sensor.py +++ b/tests/components/griddy/test_sensor.py @@ -1,13 +1,13 @@ """The sensor tests for the griddy platform.""" import json import os +from unittest.mock import patch from griddypower.async_api import GriddyPriceData from homeassistant.components.griddy import CONF_LOADZONE, DOMAIN from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import load_fixture diff --git a/tests/components/group/test_init.py b/tests/components/group/test_init.py index 77f137c6ee1..627e3c5bbe0 100644 --- a/tests/components/group/test_init.py +++ b/tests/components/group/test_init.py @@ -1,6 +1,7 @@ """The tests for the Group components.""" # pylint: disable=protected-access from collections import OrderedDict +from unittest.mock import patch import homeassistant.components.group as group from homeassistant.const import ( @@ -19,7 +20,6 @@ from homeassistant.core import CoreState from homeassistant.helpers.event import TRACK_STATE_CHANGE_CALLBACKS from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import assert_setup_component from tests.components.group import common diff --git a/tests/components/group/test_light.py b/tests/components/group/test_light.py index 8ce9f4bf9f3..136da458f66 100644 --- a/tests/components/group/test_light.py +++ b/tests/components/group/test_light.py @@ -1,5 +1,7 @@ """The tests for the Group Light platform.""" from os import path +import unittest.mock +from unittest.mock import MagicMock, patch from homeassistant import config as hass_config from homeassistant.components.group import DOMAIN, SERVICE_RELOAD @@ -31,9 +33,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -import tests.async_mock -from tests.async_mock import MagicMock, patch - async def test_default_state(hass): """Test light group default state.""" @@ -603,7 +602,7 @@ async def test_invalid_service_calls(hass): grouped_light = add_entities.call_args[0][0][0] grouped_light.hass = hass - with tests.async_mock.patch.object(hass.services, "async_call") as mock_call: + with unittest.mock.patch.object(hass.services, "async_call") as mock_call: await grouped_light.async_turn_on(brightness=150, four_oh_four="404") data = {ATTR_ENTITY_ID: ["light.test1", "light.test2"], ATTR_BRIGHTNESS: 150} mock_call.assert_called_once_with( diff --git a/tests/components/group/test_notify.py b/tests/components/group/test_notify.py index 05a23fa4e7a..a0f210c68a2 100644 --- a/tests/components/group/test_notify.py +++ b/tests/components/group/test_notify.py @@ -1,5 +1,6 @@ """The tests for the notify.group platform.""" from os import path +from unittest.mock import MagicMock, patch from homeassistant import config as hass_config import homeassistant.components.demo.notify as demo @@ -8,8 +9,6 @@ import homeassistant.components.group.notify as group import homeassistant.components.notify as notify from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, patch - async def test_send_message_with_data(hass): """Test sending a message with to a notify group.""" diff --git a/tests/components/group/test_reproduce_state.py b/tests/components/group/test_reproduce_state.py index 13422cd0826..58bbc94876e 100644 --- a/tests/components/group/test_reproduce_state.py +++ b/tests/components/group/test_reproduce_state.py @@ -1,12 +1,11 @@ """The tests for reproduction of state.""" from asyncio import Future +from unittest.mock import patch from homeassistant.components.group.reproduce_state import async_reproduce_states from homeassistant.core import Context, State -from tests.async_mock import patch - async def test_reproduce_group(hass): """Test reproduce_state with group.""" diff --git a/tests/components/guardian/conftest.py b/tests/components/guardian/conftest.py index cfa9174ef57..1a83222c575 100644 --- a/tests/components/guardian/conftest.py +++ b/tests/components/guardian/conftest.py @@ -1,7 +1,7 @@ """Define fixtures for Elexa Guardian tests.""" -import pytest +from unittest.mock import patch -from tests.async_mock import patch +import pytest @pytest.fixture() diff --git a/tests/components/guardian/test_config_flow.py b/tests/components/guardian/test_config_flow.py index db0cf877d37..e9b53b4e629 100644 --- a/tests/components/guardian/test_config_flow.py +++ b/tests/components/guardian/test_config_flow.py @@ -1,4 +1,6 @@ """Define tests for the Elexa Guardian config flow.""" +from unittest.mock import patch + from aioguardian.errors import GuardianError from homeassistant import data_entry_flow @@ -10,7 +12,6 @@ from homeassistant.components.guardian.config_flow import ( from homeassistant.config_entries import SOURCE_USER, SOURCE_ZEROCONF from homeassistant.const import CONF_IP_ADDRESS, CONF_PORT -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/hangouts/test_config_flow.py b/tests/components/hangouts/test_config_flow.py index 9cdb5799951..93f909d3bd4 100644 --- a/tests/components/hangouts/test_config_flow.py +++ b/tests/components/hangouts/test_config_flow.py @@ -1,11 +1,11 @@ """Tests for the Google Hangouts config flow.""" +from unittest.mock import patch + from homeassistant import data_entry_flow from homeassistant.components.hangouts import config_flow from homeassistant.const import CONF_EMAIL, CONF_PASSWORD -from tests.async_mock import patch - EMAIL = "test@test.com" PASSWORD = "1232456" diff --git a/tests/components/harmony/test_config_flow.py b/tests/components/harmony/test_config_flow.py index 994188eb62a..f43c9f6b478 100644 --- a/tests/components/harmony/test_config_flow.py +++ b/tests/components/harmony/test_config_flow.py @@ -1,10 +1,11 @@ """Test the Logitech Harmony Hub config flow.""" +from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch + from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.harmony.config_flow import CannotConnect from homeassistant.components.harmony.const import DOMAIN, PREVIOUS_ACTIVE_ACTIVITY from homeassistant.const import CONF_HOST, CONF_NAME -from tests.async_mock import AsyncMock, MagicMock, PropertyMock, patch from tests.common import MockConfigEntry diff --git a/tests/components/hassio/conftest.py b/tests/components/hassio/conftest.py index f52a825ca29..1442d133f1e 100644 --- a/tests/components/hassio/conftest.py +++ b/tests/components/hassio/conftest.py @@ -1,5 +1,6 @@ """Fixtures for Hass.io.""" import os +from unittest.mock import Mock, patch import pytest @@ -9,8 +10,6 @@ from homeassistant.setup import async_setup_component from . import HASSIO_TOKEN -from tests.async_mock import Mock, patch - @pytest.fixture def hassio_env(): diff --git a/tests/components/hassio/test_addon_panel.py b/tests/components/hassio/test_addon_panel.py index 9b11fd6dfc2..3f6db4dc430 100644 --- a/tests/components/hassio/test_addon_panel.py +++ b/tests/components/hassio/test_addon_panel.py @@ -1,10 +1,10 @@ """Test add-on panel.""" +from unittest.mock import patch + import pytest from homeassistant.setup import async_setup_component -from tests.async_mock import patch - @pytest.fixture(autouse=True) def mock_all(aioclient_mock): diff --git a/tests/components/hassio/test_auth.py b/tests/components/hassio/test_auth.py index c5ac9df74b7..5f27c06a190 100644 --- a/tests/components/hassio/test_auth.py +++ b/tests/components/hassio/test_auth.py @@ -1,8 +1,8 @@ """The tests for the hassio component.""" -from homeassistant.auth.providers.homeassistant import InvalidAuth +from unittest.mock import Mock, patch -from tests.async_mock import Mock, patch +from homeassistant.auth.providers.homeassistant import InvalidAuth async def test_auth_success(hass, hassio_client_supervisor): diff --git a/tests/components/hassio/test_discovery.py b/tests/components/hassio/test_discovery.py index 3bb97a6662e..c23ee40de6e 100644 --- a/tests/components/hassio/test_discovery.py +++ b/tests/components/hassio/test_discovery.py @@ -1,10 +1,10 @@ """Test config flow.""" +from unittest.mock import Mock, patch + from homeassistant.components.hassio.handler import HassioAPIError from homeassistant.const import EVENT_HOMEASSISTANT_START from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, patch - async def test_hassio_discovery_startup(hass, aioclient_mock, hassio_client): """Test startup and discovery after event.""" diff --git a/tests/components/hassio/test_http.py b/tests/components/hassio/test_http.py index ea087cdc620..2ec964d8e8b 100644 --- a/tests/components/hassio/test_http.py +++ b/tests/components/hassio/test_http.py @@ -1,12 +1,11 @@ """The tests for the hassio component.""" import asyncio +from unittest.mock import patch import pytest from homeassistant.components.hassio.http import _need_auth -from tests.async_mock import patch - async def test_forward_request(hassio_client, aioclient_mock): """Test fetching normal path.""" diff --git a/tests/components/hassio/test_init.py b/tests/components/hassio/test_init.py index 214551bc3b7..7ed24dca457 100644 --- a/tests/components/hassio/test_init.py +++ b/tests/components/hassio/test_init.py @@ -1,5 +1,6 @@ """The tests for the hassio component.""" import os +from unittest.mock import patch import pytest @@ -8,8 +9,6 @@ from homeassistant.components import frontend from homeassistant.components.hassio import STORAGE_KEY from homeassistant.setup import async_setup_component -from tests.async_mock import patch - MOCK_ENVIRON = {"HASSIO": "127.0.0.1", "HASSIO_TOKEN": "abcdefgh"} diff --git a/tests/components/hassio/test_system_health.py b/tests/components/hassio/test_system_health.py index cd6cb2d939f..88eb7ea20f8 100644 --- a/tests/components/hassio/test_system_health.py +++ b/tests/components/hassio/test_system_health.py @@ -1,6 +1,7 @@ """Test hassio system health.""" import asyncio import os +from unittest.mock import patch from aiohttp import ClientError @@ -8,7 +9,6 @@ from homeassistant.setup import async_setup_component from .test_init import MOCK_ENVIRON -from tests.async_mock import patch from tests.common import get_system_health_info diff --git a/tests/components/hddtemp/test_sensor.py b/tests/components/hddtemp/test_sensor.py index 4062d737ea2..43350c45570 100644 --- a/tests/components/hddtemp/test_sensor.py +++ b/tests/components/hddtemp/test_sensor.py @@ -1,11 +1,11 @@ """The tests for the hddtemp platform.""" import socket import unittest +from unittest.mock import patch from homeassistant.const import TEMP_CELSIUS from homeassistant.setup import setup_component -from tests.async_mock import patch from tests.common import get_test_home_assistant VALID_CONFIG_MINIMAL = {"sensor": {"platform": "hddtemp"}} diff --git a/tests/components/heos/conftest.py b/tests/components/heos/conftest.py index 86be36e8188..fa7615e2de8 100644 --- a/tests/components/heos/conftest.py +++ b/tests/components/heos/conftest.py @@ -1,5 +1,6 @@ """Configuration for HEOS tests.""" from typing import Dict, Sequence +from unittest.mock import Mock, patch as patch from pyheos import Dispatcher, Heos, HeosPlayer, HeosSource, InputSource, const import pytest @@ -8,7 +9,6 @@ from homeassistant.components import ssdp from homeassistant.components.heos import DOMAIN from homeassistant.const import CONF_HOST -from tests.async_mock import Mock, patch as patch from tests.common import MockConfigEntry diff --git a/tests/components/heos/test_config_flow.py b/tests/components/heos/test_config_flow.py index bcc2ed67b29..e62578e5108 100644 --- a/tests/components/heos/test_config_flow.py +++ b/tests/components/heos/test_config_flow.py @@ -1,4 +1,5 @@ """Tests for the Heos config flow module.""" +from unittest.mock import patch from urllib.parse import urlparse from pyheos import HeosError @@ -10,8 +11,6 @@ from homeassistant.components.heos.const import DATA_DISCOVERED_HOSTS, DOMAIN from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_SSDP from homeassistant.const import CONF_HOST -from tests.async_mock import patch - async def test_flow_aborts_already_setup(hass, config_entry): """Test flow aborts when entry already setup.""" diff --git a/tests/components/heos/test_init.py b/tests/components/heos/test_init.py index a32ea5dd08c..6edbf7d8543 100644 --- a/tests/components/heos/test_init.py +++ b/tests/components/heos/test_init.py @@ -1,5 +1,6 @@ """Tests for the init module.""" import asyncio +from unittest.mock import Mock, patch from pyheos import CommandFailedError, HeosError, const import pytest @@ -19,8 +20,6 @@ from homeassistant.const import CONF_HOST from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, patch - async def test_async_setup_creates_entry(hass, config): """Test component setup creates entry from config.""" diff --git a/tests/components/here_travel_time/test_sensor.py b/tests/components/here_travel_time/test_sensor.py index 386dbbdf0ee..b2fcef715f1 100644 --- a/tests/components/here_travel_time/test_sensor.py +++ b/tests/components/here_travel_time/test_sensor.py @@ -1,5 +1,6 @@ """The test for the here_travel_time sensor platform.""" import logging +from unittest.mock import patch import urllib import herepy @@ -42,7 +43,6 @@ from homeassistant.const import ATTR_ICON, EVENT_HOMEASSISTANT_START from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import async_fire_time_changed, load_fixture DOMAIN = "sensor" diff --git a/tests/components/hisense_aehw4a1/test_init.py b/tests/components/hisense_aehw4a1/test_init.py index bf3c9d2c6a4..4add153ee94 100644 --- a/tests/components/hisense_aehw4a1/test_init.py +++ b/tests/components/hisense_aehw4a1/test_init.py @@ -1,12 +1,12 @@ """Tests for the Hisense AEH-W4A1 init file.""" +from unittest.mock import patch + from pyaehw4a1 import exceptions from homeassistant import config_entries, data_entry_flow from homeassistant.components import hisense_aehw4a1 from homeassistant.setup import async_setup_component -from tests.async_mock import patch - async def test_creating_entry_sets_up_climate_discovery(hass): """Test setting up Hisense AEH-W4A1 loads the climate component.""" diff --git a/tests/components/history/test_init.py b/tests/components/history/test_init.py index 0b35d5194fb..87e18305b8a 100644 --- a/tests/components/history/test_init.py +++ b/tests/components/history/test_init.py @@ -4,6 +4,7 @@ from copy import copy from datetime import timedelta import json import unittest +from unittest.mock import patch, sentinel from homeassistant.components import history, recorder from homeassistant.components.recorder.models import process_timestamp @@ -12,7 +13,6 @@ from homeassistant.helpers.json import JSONEncoder from homeassistant.setup import async_setup_component, setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch, sentinel from tests.common import ( get_test_home_assistant, init_recorder_component, diff --git a/tests/components/history_stats/test_sensor.py b/tests/components/history_stats/test_sensor.py index db6d7476912..62e3959f4ad 100644 --- a/tests/components/history_stats/test_sensor.py +++ b/tests/components/history_stats/test_sensor.py @@ -3,6 +3,7 @@ from datetime import datetime, timedelta from os import path import unittest +from unittest.mock import patch import pytest import pytz @@ -16,7 +17,6 @@ from homeassistant.helpers.template import Template from homeassistant.setup import async_setup_component, setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import get_test_home_assistant, init_recorder_component diff --git a/tests/components/hlk_sw16/test_config_flow.py b/tests/components/hlk_sw16/test_config_flow.py index ea637c805cd..6a13fae70dc 100644 --- a/tests/components/hlk_sw16/test_config_flow.py +++ b/tests/components/hlk_sw16/test_config_flow.py @@ -1,11 +1,10 @@ """Test the Hi-Link HLK-SW16 config flow.""" import asyncio +from unittest.mock import patch from homeassistant import config_entries, setup from homeassistant.components.hlk_sw16.const import DOMAIN -from tests.async_mock import patch - class MockSW16Client: """Class to mock the SW16Client client.""" diff --git a/tests/components/home_connect/test_config_flow.py b/tests/components/home_connect/test_config_flow.py index 5c94f8b3362..2852dc4fb57 100644 --- a/tests/components/home_connect/test_config_flow.py +++ b/tests/components/home_connect/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Home Connect config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.home_connect.const import ( DOMAIN, @@ -8,8 +10,6 @@ from homeassistant.components.home_connect.const import ( from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET from homeassistant.helpers import config_entry_oauth2_flow -from tests.async_mock import patch - CLIENT_ID = "1234" CLIENT_SECRET = "5678" diff --git a/tests/components/homeassistant/test_init.py b/tests/components/homeassistant/test_init.py index ca2f116a06a..ef830c7ee77 100644 --- a/tests/components/homeassistant/test_init.py +++ b/tests/components/homeassistant/test_init.py @@ -2,6 +2,7 @@ # pylint: disable=protected-access import asyncio import unittest +from unittest.mock import Mock, patch import pytest import voluptuous as vol @@ -32,7 +33,6 @@ from homeassistant.exceptions import HomeAssistantError, Unauthorized from homeassistant.helpers import entity from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, patch from tests.common import ( async_capture_events, async_mock_service, diff --git a/tests/components/homeassistant/test_scene.py b/tests/components/homeassistant/test_scene.py index 8f47d891f9f..30985432718 100644 --- a/tests/components/homeassistant/test_scene.py +++ b/tests/components/homeassistant/test_scene.py @@ -1,4 +1,6 @@ """Test Home Assistant scenes.""" +from unittest.mock import patch + import pytest import voluptuous as vol @@ -6,7 +8,6 @@ from homeassistant.components.homeassistant import scene as ha_scene from homeassistant.components.homeassistant.scene import EVENT_SCENE_RELOADED from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import async_mock_service diff --git a/tests/components/homeassistant/triggers/test_homeassistant.py b/tests/components/homeassistant/triggers/test_homeassistant.py index 9272c3620af..7ff7e566db0 100644 --- a/tests/components/homeassistant/triggers/test_homeassistant.py +++ b/tests/components/homeassistant/triggers/test_homeassistant.py @@ -1,9 +1,10 @@ """The tests for the Event automation.""" +from unittest.mock import AsyncMock, patch + import homeassistant.components.automation as automation from homeassistant.core import CoreState from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock, patch from tests.common import async_mock_service diff --git a/tests/components/homeassistant/triggers/test_numeric_state.py b/tests/components/homeassistant/triggers/test_numeric_state.py index 326990e12c6..d63cb970f80 100644 --- a/tests/components/homeassistant/triggers/test_numeric_state.py +++ b/tests/components/homeassistant/triggers/test_numeric_state.py @@ -1,5 +1,6 @@ """The tests for numeric state automation.""" from datetime import timedelta +from unittest.mock import patch import pytest import voluptuous as vol @@ -13,7 +14,6 @@ from homeassistant.core import Context from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import ( assert_setup_component, async_fire_time_changed, diff --git a/tests/components/homeassistant/triggers/test_state.py b/tests/components/homeassistant/triggers/test_state.py index 61fa991e0f4..dd98dbc429c 100644 --- a/tests/components/homeassistant/triggers/test_state.py +++ b/tests/components/homeassistant/triggers/test_state.py @@ -1,5 +1,6 @@ """The test for state automation.""" from datetime import timedelta +from unittest.mock import patch import pytest @@ -10,7 +11,6 @@ from homeassistant.core import Context from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import ( assert_setup_component, async_fire_time_changed, diff --git a/tests/components/homeassistant/triggers/test_time.py b/tests/components/homeassistant/triggers/test_time.py index a37be71102d..5805aa07fe3 100644 --- a/tests/components/homeassistant/triggers/test_time.py +++ b/tests/components/homeassistant/triggers/test_time.py @@ -1,5 +1,6 @@ """The tests for the time automation.""" from datetime import timedelta +from unittest.mock import Mock, patch import pytest import voluptuous as vol @@ -10,7 +11,6 @@ from homeassistant.const import ATTR_DEVICE_CLASS, ATTR_ENTITY_ID, SERVICE_TURN_ from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import Mock, patch from tests.common import ( assert_setup_component, async_fire_time_changed, diff --git a/tests/components/homeassistant/triggers/test_time_pattern.py b/tests/components/homeassistant/triggers/test_time_pattern.py index f428bcf29bc..147bb388fed 100644 --- a/tests/components/homeassistant/triggers/test_time_pattern.py +++ b/tests/components/homeassistant/triggers/test_time_pattern.py @@ -1,5 +1,6 @@ """The tests for the time_pattern automation.""" from datetime import timedelta +from unittest.mock import patch import pytest import voluptuous as vol @@ -10,7 +11,6 @@ from homeassistant.const import ATTR_ENTITY_ID, ENTITY_MATCH_ALL, SERVICE_TURN_O from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import async_fire_time_changed, async_mock_service, mock_component diff --git a/tests/components/homekit/common.py b/tests/components/homekit/common.py index 4ad5f60551d..20aa0e04c2b 100644 --- a/tests/components/homekit/common.py +++ b/tests/components/homekit/common.py @@ -1,5 +1,5 @@ """Collection of fixtures and functions for the HomeKit tests.""" -from tests.async_mock import Mock, patch +from unittest.mock import Mock, patch EMPTY_8_6_JPEG = b"empty_8_6" diff --git a/tests/components/homekit/conftest.py b/tests/components/homekit/conftest.py index 0cb31e1b701..ac51c4e6368 100644 --- a/tests/components/homekit/conftest.py +++ b/tests/components/homekit/conftest.py @@ -1,12 +1,12 @@ """HomeKit session fixtures.""" +from unittest.mock import patch + from pyhap.accessory_driver import AccessoryDriver import pytest from homeassistant.components.homekit.const import EVENT_HOMEKIT_CHANGED from homeassistant.core import callback as ha_callback -from tests.async_mock import patch - @pytest.fixture def hk_driver(loop): diff --git a/tests/components/homekit/test_accessories.py b/tests/components/homekit/test_accessories.py index 91f02522126..886123062c4 100644 --- a/tests/components/homekit/test_accessories.py +++ b/tests/components/homekit/test_accessories.py @@ -3,6 +3,7 @@ This includes tests for all mock object types. """ from datetime import timedelta +from unittest.mock import Mock, patch import pytest @@ -46,7 +47,6 @@ from homeassistant.const import ( from homeassistant.helpers.event import TRACK_STATE_CHANGE_CALLBACKS import homeassistant.util.dt as dt_util -from tests.async_mock import Mock, patch from tests.common import async_fire_time_changed, async_mock_service diff --git a/tests/components/homekit/test_aidmanager.py b/tests/components/homekit/test_aidmanager.py index b7c12e86443..df1bb14dd9e 100644 --- a/tests/components/homekit/test_aidmanager.py +++ b/tests/components/homekit/test_aidmanager.py @@ -1,5 +1,6 @@ """Tests for the HomeKit AID manager.""" import os +from unittest.mock import patch from fnvhash import fnv1a_32 import pytest @@ -12,7 +13,6 @@ from homeassistant.components.homekit.aidmanager import ( from homeassistant.helpers import device_registry from homeassistant.helpers.storage import STORAGE_DIR -from tests.async_mock import patch from tests.common import MockConfigEntry, mock_device_registry, mock_registry diff --git a/tests/components/homekit/test_config_flow.py b/tests/components/homekit/test_config_flow.py index 59d65977066..a32de91cebd 100644 --- a/tests/components/homekit/test_config_flow.py +++ b/tests/components/homekit/test_config_flow.py @@ -1,4 +1,6 @@ """Test the HomeKit config flow.""" +from unittest.mock import patch + import pytest from homeassistant import config_entries, data_entry_flow, setup @@ -6,7 +8,6 @@ from homeassistant.components.homekit.const import DOMAIN from homeassistant.config_entries import SOURCE_IMPORT from homeassistant.const import CONF_NAME, CONF_PORT -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/homekit/test_get_accessories.py b/tests/components/homekit/test_get_accessories.py index ea91733fdab..314d0516223 100644 --- a/tests/components/homekit/test_get_accessories.py +++ b/tests/components/homekit/test_get_accessories.py @@ -1,4 +1,6 @@ """Package to test the get_accessory method.""" +from unittest.mock import Mock, patch + import pytest import homeassistant.components.climate as climate @@ -31,8 +33,6 @@ from homeassistant.const import ( ) from homeassistant.core import State -from tests.async_mock import Mock, patch - def test_not_supported(caplog): """Test if none is returned if entity isn't supported.""" diff --git a/tests/components/homekit/test_homekit.py b/tests/components/homekit/test_homekit.py index 8b79c3f6c58..0f9b458cdde 100644 --- a/tests/components/homekit/test_homekit.py +++ b/tests/components/homekit/test_homekit.py @@ -1,6 +1,7 @@ """Tests for the HomeKit component.""" import os from typing import Dict +from unittest.mock import ANY, AsyncMock, MagicMock, Mock, patch from pyhap.accessory import Accessory import pytest @@ -66,7 +67,6 @@ from homeassistant.util import json as json_util from .util import PATH_HOMEKIT, async_init_entry, async_init_integration -from tests.async_mock import ANY, AsyncMock, MagicMock, Mock, patch from tests.common import MockConfigEntry, mock_device_registry, mock_registry from tests.components.homekit.common import patch_debounce diff --git a/tests/components/homekit/test_img_util.py b/tests/components/homekit/test_img_util.py index 728bb8847ff..45af8e6b1e6 100644 --- a/tests/components/homekit/test_img_util.py +++ b/tests/components/homekit/test_img_util.py @@ -1,4 +1,6 @@ """Test HomeKit img_util module.""" +from unittest.mock import patch + from homeassistant.components.camera import Image from homeassistant.components.homekit.img_util import ( TurboJPEGSingleton, @@ -7,8 +9,6 @@ from homeassistant.components.homekit.img_util import ( from .common import EMPTY_8_6_JPEG, mock_turbo_jpeg -from tests.async_mock import patch - EMPTY_16_12_JPEG = b"empty_16_12" diff --git a/tests/components/homekit/test_init.py b/tests/components/homekit/test_init.py index 72670667fa7..6643ae9ae18 100644 --- a/tests/components/homekit/test_init.py +++ b/tests/components/homekit/test_init.py @@ -1,4 +1,6 @@ """Test HomeKit initialization.""" +from unittest.mock import patch + from homeassistant.components import logbook from homeassistant.components.homekit.const import ( ATTR_DISPLAY_NAME, @@ -9,7 +11,6 @@ from homeassistant.components.homekit.const import ( from homeassistant.const import ATTR_ENTITY_ID, ATTR_SERVICE from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.components.logbook.test_init import MockLazyEventPartialState diff --git a/tests/components/homekit/test_type_cameras.py b/tests/components/homekit/test_type_cameras.py index 6386b1d8e69..804e03a4e6c 100644 --- a/tests/components/homekit/test_type_cameras.py +++ b/tests/components/homekit/test_type_cameras.py @@ -1,5 +1,6 @@ """Test different accessory types: Camera.""" +from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch from uuid import UUID from pyhap.accessory_driver import AccessoryDriver @@ -34,8 +35,6 @@ from homeassistant.setup import async_setup_component from .common import mock_turbo_jpeg -from tests.async_mock import AsyncMock, MagicMock, PropertyMock, patch - MOCK_START_STREAM_TLV = "ARUCAQEBEDMD1QMXzEaatnKSQ2pxovYCNAEBAAIJAQECAgECAwEAAwsBAgAFAgLQAgMBHgQXAQFjAgQ768/RAwIrAQQEAAAAPwUCYgUDLAEBAwIMAQEBAgEAAwECBAEUAxYBAW4CBCzq28sDAhgABAQAAKBABgENBAEA" MOCK_END_POINTS_TLV = "ARAzA9UDF8xGmrZykkNqcaL2AgEAAxoBAQACDTE5Mi4xNjguMjA4LjUDAi7IBAKkxwQlAQEAAhDN0+Y0tZ4jzoO0ske9UsjpAw6D76oVXnoi7DbawIG4CwUlAQEAAhCyGcROB8P7vFRDzNF2xrK1Aw6NdcLugju9yCfkWVSaVAYEDoAsAAcEpxV8AA==" MOCK_START_STREAM_SESSION_UUID = UUID("3303d503-17cc-469a-b672-92436a71a2f6") diff --git a/tests/components/homekit/test_type_fans.py b/tests/components/homekit/test_type_fans.py index a25567b7004..bc1bac11844 100644 --- a/tests/components/homekit/test_type_fans.py +++ b/tests/components/homekit/test_type_fans.py @@ -1,5 +1,6 @@ """Test different accessory types: Fans.""" from collections import namedtuple +from unittest.mock import Mock from pyhap.const import HAP_REPR_AID, HAP_REPR_CHARS, HAP_REPR_IID, HAP_REPR_VALUE import pytest @@ -32,7 +33,6 @@ from homeassistant.const import ( from homeassistant.core import CoreState from homeassistant.helpers import entity_registry -from tests.async_mock import Mock from tests.common import async_mock_service from tests.components.homekit.common import patch_debounce diff --git a/tests/components/homekit/test_type_thermostats.py b/tests/components/homekit/test_type_thermostats.py index acb45bca85f..ce17cf7ea07 100644 --- a/tests/components/homekit/test_type_thermostats.py +++ b/tests/components/homekit/test_type_thermostats.py @@ -1,4 +1,6 @@ """Test different accessory types: Thermostats.""" +from unittest.mock import patch + from pyhap.const import HAP_REPR_AID, HAP_REPR_CHARS, HAP_REPR_IID, HAP_REPR_VALUE import pytest @@ -61,7 +63,6 @@ from homeassistant.const import ( from homeassistant.core import CoreState from homeassistant.helpers import entity_registry -from tests.async_mock import patch from tests.common import async_mock_service diff --git a/tests/components/homekit/util.py b/tests/components/homekit/util.py index a9def6d02f7..8555be00aa7 100644 --- a/tests/components/homekit/util.py +++ b/tests/components/homekit/util.py @@ -1,10 +1,11 @@ """Test util for the homekit integration.""" +from unittest.mock import patch + from homeassistant.components.homekit.const import DOMAIN from homeassistant.const import CONF_NAME, CONF_PORT from homeassistant.core import HomeAssistant -from tests.async_mock import patch from tests.common import MockConfigEntry PATH_HOMEKIT = "homeassistant.components.homekit" diff --git a/tests/components/homekit_controller/conftest.py b/tests/components/homekit_controller/conftest.py index cb75fc205e2..26adb25df21 100644 --- a/tests/components/homekit_controller/conftest.py +++ b/tests/components/homekit_controller/conftest.py @@ -1,13 +1,13 @@ """HomeKit controller session fixtures.""" import datetime from unittest import mock +import unittest.mock from aiohomekit.testing import FakeController import pytest import homeassistant.util.dt as dt_util -import tests.async_mock from tests.components.light.conftest import mock_light_profiles # noqa @@ -25,5 +25,5 @@ def utcnow(request): def controller(hass): """Replace aiohomekit.Controller with an instance of aiohomekit.testing.FakeController.""" instance = FakeController() - with tests.async_mock.patch("aiohomekit.Controller", return_value=instance): + with unittest.mock.patch("aiohomekit.Controller", return_value=instance): yield instance diff --git a/tests/components/homekit_controller/test_config_flow.py b/tests/components/homekit_controller/test_config_flow.py index 72a8133159d..9cc785f85fb 100644 --- a/tests/components/homekit_controller/test_config_flow.py +++ b/tests/components/homekit_controller/test_config_flow.py @@ -1,5 +1,7 @@ """Tests for homekit_controller config flow.""" from unittest import mock +import unittest.mock +from unittest.mock import patch import aiohomekit from aiohomekit.model import Accessories, Accessory @@ -10,8 +12,6 @@ import pytest from homeassistant.components.homekit_controller import config_flow from homeassistant.helpers import device_registry -import tests.async_mock -from tests.async_mock import patch from tests.common import MockConfigEntry, mock_device_registry PAIRING_START_FORM_ERRORS = [ @@ -71,15 +71,15 @@ def _setup_flow_handler(hass, pairing=None): flow.hass = hass flow.context = {} - finish_pairing = tests.async_mock.AsyncMock(return_value=pairing) + finish_pairing = unittest.mock.AsyncMock(return_value=pairing) discovery = mock.Mock() discovery.device_id = "00:00:00:00:00:00" - discovery.start_pairing = tests.async_mock.AsyncMock(return_value=finish_pairing) + discovery.start_pairing = unittest.mock.AsyncMock(return_value=finish_pairing) flow.controller = mock.Mock() flow.controller.pairings = {} - flow.controller.find_ip_by_device_id = tests.async_mock.AsyncMock( + flow.controller.find_ip_by_device_id = unittest.mock.AsyncMock( return_value=discovery ) @@ -475,7 +475,7 @@ async def test_pair_abort_errors_on_finish(hass, controller, exception, expected # User initiates pairing - this triggers the device to show a pairing code # and then HA to show a pairing form - finish_pairing = tests.async_mock.AsyncMock(side_effect=exception("error")) + finish_pairing = unittest.mock.AsyncMock(side_effect=exception("error")) with patch.object(device, "start_pairing", return_value=finish_pairing): result = await hass.config_entries.flow.async_configure(result["flow_id"]) @@ -515,7 +515,7 @@ async def test_pair_form_errors_on_finish(hass, controller, exception, expected) # User initiates pairing - this triggers the device to show a pairing code # and then HA to show a pairing form - finish_pairing = tests.async_mock.AsyncMock(side_effect=exception("error")) + finish_pairing = unittest.mock.AsyncMock(side_effect=exception("error")) with patch.object(device, "start_pairing", return_value=finish_pairing): result = await hass.config_entries.flow.async_configure(result["flow_id"]) diff --git a/tests/components/homematicip_cloud/conftest.py b/tests/components/homematicip_cloud/conftest.py index 8bf792c259f..b05683d2361 100644 --- a/tests/components/homematicip_cloud/conftest.py +++ b/tests/components/homematicip_cloud/conftest.py @@ -1,4 +1,6 @@ """Initializer helpers for HomematicIP fake server.""" +from unittest.mock import AsyncMock, MagicMock, Mock, patch + from homematicip.aio.auth import AsyncAuth from homematicip.aio.connection import AsyncConnection from homematicip.aio.home import AsyncHome @@ -22,7 +24,6 @@ from homeassistant.helpers.typing import ConfigType, HomeAssistantType from .helper import AUTH_TOKEN, HAPID, HAPPIN, HomeFactory -from tests.async_mock import AsyncMock, MagicMock, Mock, patch from tests.common import MockConfigEntry from tests.components.light.conftest import mock_light_profiles # noqa diff --git a/tests/components/homematicip_cloud/helper.py b/tests/components/homematicip_cloud/helper.py index ca7d8862756..8da5e4861c0 100644 --- a/tests/components/homematicip_cloud/helper.py +++ b/tests/components/homematicip_cloud/helper.py @@ -1,5 +1,6 @@ """Helper for HomematicIP Cloud Tests.""" import json +from unittest.mock import Mock, patch from homematicip.aio.class_maps import ( TYPE_CLASS_MAP, @@ -21,7 +22,6 @@ from homeassistant.components.homematicip_cloud.hap import HomematicipHAP from homeassistant.helpers.typing import HomeAssistantType from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, patch from tests.common import load_fixture HAPID = "3014F7110000000000000001" diff --git a/tests/components/homematicip_cloud/test_config_flow.py b/tests/components/homematicip_cloud/test_config_flow.py index e9ecab2dbfb..0b573e66b1d 100644 --- a/tests/components/homematicip_cloud/test_config_flow.py +++ b/tests/components/homematicip_cloud/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for HomematicIP Cloud config flow.""" +from unittest.mock import patch + from homeassistant.components.homematicip_cloud.const import ( DOMAIN as HMIPC_DOMAIN, HMIPC_AUTHTOKEN, @@ -7,7 +9,6 @@ from homeassistant.components.homematicip_cloud.const import ( HMIPC_PIN, ) -from tests.async_mock import patch from tests.common import MockConfigEntry DEFAULT_CONFIG = {HMIPC_HAPID: "ABC123", HMIPC_PIN: "123", HMIPC_NAME: "hmip"} diff --git a/tests/components/homematicip_cloud/test_device.py b/tests/components/homematicip_cloud/test_device.py index 0e69a67cdbf..850b9e7ad82 100644 --- a/tests/components/homematicip_cloud/test_device.py +++ b/tests/components/homematicip_cloud/test_device.py @@ -1,4 +1,6 @@ """Common tests for HomematicIP devices.""" +from unittest.mock import patch + from homematicip.base.enums import EventType from homeassistant.components.homematicip_cloud import DOMAIN as HMIPC_DOMAIN @@ -13,8 +15,6 @@ from .helper import ( get_and_check_entity_basics, ) -from tests.async_mock import patch - async def test_hmip_load_all_supported_devices(hass, default_mock_hap_factory): """Ensure that all supported devices could be loaded.""" diff --git a/tests/components/homematicip_cloud/test_hap.py b/tests/components/homematicip_cloud/test_hap.py index 2a4833553d2..6c95017a635 100644 --- a/tests/components/homematicip_cloud/test_hap.py +++ b/tests/components/homematicip_cloud/test_hap.py @@ -1,5 +1,7 @@ """Test HomematicIP Cloud accesspoint.""" +from unittest.mock import Mock, patch + from homematicip.aio.auth import AsyncAuth from homematicip.base.base_connection import HmipConnectionError import pytest @@ -21,8 +23,6 @@ from homeassistant.exceptions import ConfigEntryNotReady from .helper import HAPID, HAPPIN -from tests.async_mock import Mock, patch - async def test_auth_setup(hass): """Test auth setup for client registration.""" diff --git a/tests/components/homematicip_cloud/test_init.py b/tests/components/homematicip_cloud/test_init.py index 46059f12d00..250cba81637 100644 --- a/tests/components/homematicip_cloud/test_init.py +++ b/tests/components/homematicip_cloud/test_init.py @@ -1,5 +1,7 @@ """Test HomematicIP Cloud setup process.""" +from unittest.mock import AsyncMock, Mock, patch + from homematicip.base.base_connection import HmipConnectionError from homeassistant.components.homematicip_cloud.const import ( @@ -20,7 +22,6 @@ from homeassistant.config_entries import ( from homeassistant.const import CONF_NAME from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock, Mock, patch from tests.common import MockConfigEntry diff --git a/tests/components/html5/test_notify.py b/tests/components/html5/test_notify.py index d3faa761435..4a62eb76c27 100644 --- a/tests/components/html5/test_notify.py +++ b/tests/components/html5/test_notify.py @@ -1,5 +1,6 @@ """Test HTML5 notify platform.""" import json +from unittest.mock import MagicMock, mock_open, patch from aiohttp.hdrs import AUTHORIZATION @@ -8,8 +9,6 @@ from homeassistant.const import HTTP_INTERNAL_SERVER_ERROR from homeassistant.exceptions import HomeAssistantError from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, mock_open, patch - CONFIG_FILE = "file.conf" VAPID_CONF = { diff --git a/tests/components/http/test_auth.py b/tests/components/http/test_auth.py index e3274ddfa7d..71c01630a67 100644 --- a/tests/components/http/test_auth.py +++ b/tests/components/http/test_auth.py @@ -1,6 +1,7 @@ """The tests for the Home Assistant HTTP component.""" from datetime import timedelta from ipaddress import ip_network +from unittest.mock import patch from aiohttp import BasicAuth, web from aiohttp.web_exceptions import HTTPUnauthorized @@ -14,8 +15,6 @@ from homeassistant.setup import async_setup_component from . import HTTP_HEADER_HA_AUTH, mock_real_ip -from tests.async_mock import patch - API_PASSWORD = "test-password" # Don't add 127.0.0.1/::1 as trusted, as it may interfere with other test cases diff --git a/tests/components/http/test_ban.py b/tests/components/http/test_ban.py index 993ec708c18..76f5f94a2ed 100644 --- a/tests/components/http/test_ban.py +++ b/tests/components/http/test_ban.py @@ -2,6 +2,7 @@ # pylint: disable=protected-access from ipaddress import ip_address import os +from unittest.mock import Mock, mock_open, patch from aiohttp import web from aiohttp.web_exceptions import HTTPUnauthorized @@ -23,7 +24,6 @@ from homeassistant.setup import async_setup_component from . import mock_real_ip -from tests.async_mock import Mock, mock_open, patch from tests.common import async_mock_service SUPERVISOR_IP = "1.2.3.4" diff --git a/tests/components/http/test_cors.py b/tests/components/http/test_cors.py index 191cdb0ba49..04447191fd5 100644 --- a/tests/components/http/test_cors.py +++ b/tests/components/http/test_cors.py @@ -1,5 +1,6 @@ """Test cors for the HTTP component.""" from pathlib import Path +from unittest.mock import patch from aiohttp import web from aiohttp.hdrs import ( @@ -18,8 +19,6 @@ from homeassistant.setup import async_setup_component from . import HTTP_HEADER_HA_AUTH -from tests.async_mock import patch - TRUSTED_ORIGIN = "https://home-assistant.io" diff --git a/tests/components/http/test_data_validator.py b/tests/components/http/test_data_validator.py index c7b5ed42ccd..a6e812ccdfe 100644 --- a/tests/components/http/test_data_validator.py +++ b/tests/components/http/test_data_validator.py @@ -1,12 +1,12 @@ """Test data validator decorator.""" +from unittest.mock import Mock + from aiohttp import web import voluptuous as vol from homeassistant.components.http import HomeAssistantView from homeassistant.components.http.data_validator import RequestDataValidator -from tests.async_mock import Mock - async def get_client(aiohttp_client, validator): """Generate a client that hits a view decorated with validator.""" diff --git a/tests/components/http/test_init.py b/tests/components/http/test_init.py index 2c95d03a9ef..3dd587cd7a4 100644 --- a/tests/components/http/test_init.py +++ b/tests/components/http/test_init.py @@ -1,6 +1,7 @@ """The tests for the Home Assistant HTTP component.""" from ipaddress import ip_network import logging +from unittest.mock import Mock, patch import pytest @@ -8,8 +9,6 @@ import homeassistant.components.http as http from homeassistant.setup import async_setup_component from homeassistant.util.ssl import server_context_intermediate, server_context_modern -from tests.async_mock import Mock, patch - @pytest.fixture def mock_stack(): diff --git a/tests/components/http/test_view.py b/tests/components/http/test_view.py index 045f0837983..522344461cb 100644 --- a/tests/components/http/test_view.py +++ b/tests/components/http/test_view.py @@ -1,4 +1,6 @@ """Tests for Home Assistant View.""" +from unittest.mock import AsyncMock, Mock + from aiohttp.web_exceptions import ( HTTPBadRequest, HTTPInternalServerError, @@ -13,8 +15,6 @@ from homeassistant.components.http.view import ( ) from homeassistant.exceptions import ServiceNotFound, Unauthorized -from tests.async_mock import AsyncMock, Mock - @pytest.fixture def mock_request(): diff --git a/tests/components/huawei_lte/test_config_flow.py b/tests/components/huawei_lte/test_config_flow.py index 2547aa3f01f..baffcef3476 100644 --- a/tests/components/huawei_lte/test_config_flow.py +++ b/tests/components/huawei_lte/test_config_flow.py @@ -1,5 +1,7 @@ """Tests for the Huawei LTE config flow.""" +from unittest.mock import patch + from huawei_lte_api.enums.client import ResponseCodeEnum from huawei_lte_api.enums.user import LoginErrorEnum, LoginStateEnum, PasswordTypeEnum import pytest @@ -17,7 +19,6 @@ from homeassistant.const import ( CONF_USERNAME, ) -from tests.async_mock import patch from tests.common import MockConfigEntry FIXTURE_USER_INPUT = { diff --git a/tests/components/hue/conftest.py b/tests/components/hue/conftest.py index 55b6443bdfa..fc42babbb35 100644 --- a/tests/components/hue/conftest.py +++ b/tests/components/hue/conftest.py @@ -1,5 +1,6 @@ """Test helpers for Hue.""" from collections import deque +from unittest.mock import AsyncMock, Mock, patch from aiohue.groups import Groups from aiohue.lights import Lights @@ -11,7 +12,6 @@ from homeassistant import config_entries from homeassistant.components import hue from homeassistant.components.hue import sensor_base as hue_sensor_base -from tests.async_mock import AsyncMock, Mock, patch from tests.components.light.conftest import mock_light_profiles # noqa diff --git a/tests/components/hue/test_bridge.py b/tests/components/hue/test_bridge.py index 06dd459723d..3e6465d6bc8 100644 --- a/tests/components/hue/test_bridge.py +++ b/tests/components/hue/test_bridge.py @@ -1,4 +1,6 @@ """Test Hue bridge.""" +from unittest.mock import AsyncMock, Mock, patch + import pytest from homeassistant import config_entries @@ -10,8 +12,6 @@ from homeassistant.components.hue.const import ( ) from homeassistant.exceptions import ConfigEntryNotReady -from tests.async_mock import AsyncMock, Mock, patch - async def test_bridge_setup(hass): """Test a successful setup.""" diff --git a/tests/components/hue/test_config_flow.py b/tests/components/hue/test_config_flow.py index a551e623e63..c7dc83183ae 100644 --- a/tests/components/hue/test_config_flow.py +++ b/tests/components/hue/test_config_flow.py @@ -1,5 +1,6 @@ """Tests for Philips Hue config flow.""" import asyncio +from unittest.mock import AsyncMock, Mock, patch from aiohttp import client_exceptions import aiohue @@ -11,7 +12,6 @@ from homeassistant import config_entries from homeassistant.components import ssdp from homeassistant.components.hue import config_flow, const -from tests.async_mock import AsyncMock, Mock, patch from tests.common import MockConfigEntry diff --git a/tests/components/hue/test_init.py b/tests/components/hue/test_init.py index 70a6c3b8756..1f6ba83e2ca 100644 --- a/tests/components/hue/test_init.py +++ b/tests/components/hue/test_init.py @@ -1,5 +1,5 @@ """Test Hue setup process.""" -from unittest.mock import Mock +from unittest.mock import AsyncMock, Mock, patch import pytest @@ -7,7 +7,6 @@ from homeassistant import config_entries from homeassistant.components import hue from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock, patch from tests.common import MockConfigEntry diff --git a/tests/components/hue/test_init_multiple_bridges.py b/tests/components/hue/test_init_multiple_bridges.py index 32be7677398..19b4da44a4d 100644 --- a/tests/components/hue/test_init_multiple_bridges.py +++ b/tests/components/hue/test_init_multiple_bridges.py @@ -1,5 +1,7 @@ """Test Hue init with multiple bridges.""" +from unittest.mock import Mock, patch + from aiohue.groups import Groups from aiohue.lights import Lights from aiohue.scenes import Scenes @@ -11,8 +13,6 @@ from homeassistant.components import hue from homeassistant.components.hue import sensor_base as hue_sensor_base from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, patch - async def setup_component(hass): """Hue component.""" diff --git a/tests/components/hue/test_light.py b/tests/components/hue/test_light.py index 2029c32c82f..629a9a4c98b 100644 --- a/tests/components/hue/test_light.py +++ b/tests/components/hue/test_light.py @@ -1,5 +1,6 @@ """Philips Hue lights platform tests.""" import asyncio +from unittest.mock import Mock import aiohue @@ -8,8 +9,6 @@ from homeassistant.components import hue from homeassistant.components.hue import light as hue_light from homeassistant.util import color -from tests.async_mock import Mock - HUE_LIGHT_NS = "homeassistant.components.light.hue." GROUP_RESPONSE = { "1": { diff --git a/tests/components/hue/test_sensor_base.py b/tests/components/hue/test_sensor_base.py index fcf3513bc7c..eb7ece241c3 100644 --- a/tests/components/hue/test_sensor_base.py +++ b/tests/components/hue/test_sensor_base.py @@ -1,5 +1,6 @@ """Philips Hue sensors platform tests.""" import asyncio +from unittest.mock import Mock import aiohue @@ -7,8 +8,6 @@ from homeassistant.components.hue.hue_event import CONF_HUE_EVENT from .conftest import create_mock_bridge, setup_bridge_for_sensors as setup_bridge -from tests.async_mock import Mock - PRESENCE_SENSOR_1_PRESENT = { "state": {"presence": True, "lastupdated": "2019-01-01T01:00:00"}, "swupdate": {"state": "noupdates", "lastinstall": "2019-01-01T00:00:00"}, diff --git a/tests/components/hunterdouglas_powerview/test_config_flow.py b/tests/components/hunterdouglas_powerview/test_config_flow.py index 84457a14a5e..dbcb5d719c9 100644 --- a/tests/components/hunterdouglas_powerview/test_config_flow.py +++ b/tests/components/hunterdouglas_powerview/test_config_flow.py @@ -1,11 +1,11 @@ """Test the Logitech Harmony Hub config flow.""" import asyncio import json +from unittest.mock import AsyncMock, MagicMock, patch from homeassistant import config_entries, setup from homeassistant.components.hunterdouglas_powerview.const import DOMAIN -from tests.async_mock import AsyncMock, MagicMock, patch from tests.common import MockConfigEntry, load_fixture diff --git a/tests/components/hvv_departures/test_config_flow.py b/tests/components/hvv_departures/test_config_flow.py index bd3e955d2d8..a6a927afd2e 100644 --- a/tests/components/hvv_departures/test_config_flow.py +++ b/tests/components/hvv_departures/test_config_flow.py @@ -1,5 +1,6 @@ """Test the HVV Departures config flow.""" import json +from unittest.mock import patch from pygti.exceptions import CannotConnect, InvalidAuth @@ -13,7 +14,6 @@ from homeassistant.components.hvv_departures.const import ( from homeassistant.config_entries import CONN_CLASS_CLOUD_POLL, SOURCE_USER from homeassistant.const import CONF_HOST, CONF_OFFSET, CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry, load_fixture FIXTURE_INIT = json.loads(load_fixture("hvv_departures/init.json")) diff --git a/tests/components/hyperion/__init__.py b/tests/components/hyperion/__init__.py index 31a6c49eeb3..abf9f28a10b 100644 --- a/tests/components/hyperion/__init__.py +++ b/tests/components/hyperion/__init__.py @@ -4,6 +4,7 @@ from __future__ import annotations import logging from types import TracebackType from typing import Any, Dict, Optional, Type +from unittest.mock import AsyncMock, Mock, patch # type: ignore[attr-defined] from hyperion import const @@ -13,7 +14,6 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_HOST, CONF_PORT from homeassistant.helpers.typing import HomeAssistantType -from tests.async_mock import AsyncMock, Mock, patch # type: ignore[attr-defined] from tests.common import MockConfigEntry TEST_HOST = "test" diff --git a/tests/components/hyperion/test_config_flow.py b/tests/components/hyperion/test_config_flow.py index 481b7957849..c420fe2fe17 100644 --- a/tests/components/hyperion/test_config_flow.py +++ b/tests/components/hyperion/test_config_flow.py @@ -2,6 +2,7 @@ import logging from typing import Any, Dict, Optional +from unittest.mock import AsyncMock, patch # type: ignore[attr-defined] from hyperion import const @@ -43,7 +44,6 @@ from . import ( create_mock_client, ) -from tests.async_mock import AsyncMock, patch # type: ignore[attr-defined] from tests.common import MockConfigEntry _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/hyperion/test_light.py b/tests/components/hyperion/test_light.py index 4636a9ad59c..ea13aaab5ae 100644 --- a/tests/components/hyperion/test_light.py +++ b/tests/components/hyperion/test_light.py @@ -2,6 +2,7 @@ import logging from types import MappingProxyType from typing import Any, Optional +from unittest.mock import AsyncMock, call, patch # type: ignore[attr-defined] from hyperion import const @@ -55,8 +56,6 @@ from . import ( setup_test_config_entry, ) -from tests.async_mock import AsyncMock, call, patch # type: ignore[attr-defined] - _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/icloud/conftest.py b/tests/components/icloud/conftest.py index 2ed9006cdb6..2230cc2ea32 100644 --- a/tests/components/icloud/conftest.py +++ b/tests/components/icloud/conftest.py @@ -1,7 +1,7 @@ """Configure iCloud tests.""" -import pytest +from unittest.mock import patch -from tests.async_mock import patch +import pytest @pytest.fixture(name="icloud_bypass_setup", autouse=True) diff --git a/tests/components/icloud/test_config_flow.py b/tests/components/icloud/test_config_flow.py index 5ed46a6136f..a774e61f3ec 100644 --- a/tests/components/icloud/test_config_flow.py +++ b/tests/components/icloud/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for the iCloud config flow.""" +from unittest.mock import MagicMock, Mock, patch + from pyicloud.exceptions import PyiCloudFailedLoginException import pytest @@ -20,7 +22,6 @@ from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_REAUTH, SOURCE_US from homeassistant.const import CONF_PASSWORD, CONF_USERNAME from homeassistant.helpers.typing import HomeAssistantType -from tests.async_mock import MagicMock, Mock, patch from tests.common import MockConfigEntry USERNAME = "username@me.com" diff --git a/tests/components/ifttt/test_init.py b/tests/components/ifttt/test_init.py index e5fd8841a2b..d10df2492d4 100644 --- a/tests/components/ifttt/test_init.py +++ b/tests/components/ifttt/test_init.py @@ -1,10 +1,10 @@ """Test the init file of IFTTT.""" +from unittest.mock import patch + from homeassistant import data_entry_flow from homeassistant.components import ifttt from homeassistant.core import callback -from tests.async_mock import patch - async def test_config_flow_registers_webhook(hass, aiohttp_client): """Test setting up IFTTT and sending webhook.""" diff --git a/tests/components/ign_sismologia/test_geo_location.py b/tests/components/ign_sismologia/test_geo_location.py index 5695f26c5aa..1ad5ae2a2b2 100644 --- a/tests/components/ign_sismologia/test_geo_location.py +++ b/tests/components/ign_sismologia/test_geo_location.py @@ -1,5 +1,6 @@ """The tests for the IGN Sismologia (Earthquakes) Feed platform.""" import datetime +from unittest.mock import MagicMock, call, patch from homeassistant.components import geo_location from homeassistant.components.geo_location import ATTR_SOURCE @@ -28,7 +29,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import MagicMock, call, patch from tests.common import assert_setup_component, async_fire_time_changed CONFIG = {geo_location.DOMAIN: [{"platform": "ign_sismologia", CONF_RADIUS: 200}]} diff --git a/tests/components/image/test_init.py b/tests/components/image/test_init.py index 277e6f07149..ab73bb71286 100644 --- a/tests/components/image/test_init.py +++ b/tests/components/image/test_init.py @@ -1,6 +1,7 @@ """Test that we can upload images.""" import pathlib import tempfile +from unittest.mock import patch from aiohttp import ClientSession, ClientWebSocketResponse @@ -8,8 +9,6 @@ from homeassistant.components.websocket_api import const as ws_const from homeassistant.setup import async_setup_component from homeassistant.util import dt as util_dt -from tests.async_mock import patch - async def test_upload_image(hass, hass_client, hass_ws_client): """Test we can upload an image.""" diff --git a/tests/components/image_processing/test_init.py b/tests/components/image_processing/test_init.py index c006a262e85..3e6a3cc960f 100644 --- a/tests/components/image_processing/test_init.py +++ b/tests/components/image_processing/test_init.py @@ -1,4 +1,6 @@ """The tests for the image_processing component.""" +from unittest.mock import PropertyMock, patch + import homeassistant.components.http as http import homeassistant.components.image_processing as ip from homeassistant.const import ATTR_ENTITY_PICTURE @@ -6,7 +8,6 @@ from homeassistant.core import callback from homeassistant.exceptions import HomeAssistantError from homeassistant.setup import setup_component -from tests.async_mock import PropertyMock, patch from tests.common import ( assert_setup_component, get_test_home_assistant, diff --git a/tests/components/influxdb/test_init.py b/tests/components/influxdb/test_init.py index da405e3975b..db22b5c5236 100644 --- a/tests/components/influxdb/test_init.py +++ b/tests/components/influxdb/test_init.py @@ -1,6 +1,7 @@ """The tests for the InfluxDB component.""" from dataclasses import dataclass import datetime +from unittest.mock import MagicMock, Mock, call, patch import pytest @@ -16,8 +17,6 @@ from homeassistant.const import ( from homeassistant.core import split_entity_id from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, Mock, call, patch - INFLUX_PATH = "homeassistant.components.influxdb" INFLUX_CLIENT_PATH = f"{INFLUX_PATH}.InfluxDBClient" BASE_V1_CONFIG = {} diff --git a/tests/components/influxdb/test_sensor.py b/tests/components/influxdb/test_sensor.py index 633f9e891f8..57983d14aba 100644 --- a/tests/components/influxdb/test_sensor.py +++ b/tests/components/influxdb/test_sensor.py @@ -2,6 +2,7 @@ from dataclasses import dataclass from datetime import timedelta from typing import Dict, List, Type +from unittest.mock import MagicMock, patch from influxdb.exceptions import InfluxDBClientError, InfluxDBServerError from influxdb_client.rest import ApiException @@ -24,7 +25,6 @@ from homeassistant.helpers.entity_platform import PLATFORM_NOT_READY_BASE_WAIT_T from homeassistant.setup import async_setup_component from homeassistant.util import dt as dt_util -from tests.async_mock import MagicMock, patch from tests.common import async_fire_time_changed INFLUXDB_PATH = "homeassistant.components.influxdb" diff --git a/tests/components/input_boolean/test_init.py b/tests/components/input_boolean/test_init.py index 9911ced28dd..88562678436 100644 --- a/tests/components/input_boolean/test_init.py +++ b/tests/components/input_boolean/test_init.py @@ -1,6 +1,7 @@ """The tests for the input_boolean component.""" # pylint: disable=protected-access import logging +from unittest.mock import patch import pytest @@ -22,7 +23,6 @@ from homeassistant.core import Context, CoreState, State from homeassistant.helpers import entity_registry from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import mock_component, mock_restore_cache _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/input_datetime/test_init.py b/tests/components/input_datetime/test_init.py index a336ef82363..f6cff819791 100644 --- a/tests/components/input_datetime/test_init.py +++ b/tests/components/input_datetime/test_init.py @@ -1,6 +1,7 @@ """Tests for the Input slider component.""" # pylint: disable=protected-access import datetime +from unittest.mock import patch import pytest import voluptuous as vol @@ -31,7 +32,6 @@ from homeassistant.helpers import entity_registry from homeassistant.setup import async_setup_component from homeassistant.util import dt as dt_util -from tests.async_mock import patch from tests.common import mock_restore_cache INITIAL_DATE = "2020-01-10" diff --git a/tests/components/input_number/test_init.py b/tests/components/input_number/test_init.py index 8971439de74..28b9d27d23f 100644 --- a/tests/components/input_number/test_init.py +++ b/tests/components/input_number/test_init.py @@ -1,4 +1,7 @@ """The tests for the Input number component.""" +# pylint: disable=protected-access +from unittest.mock import patch + import pytest import voluptuous as vol @@ -21,8 +24,6 @@ from homeassistant.exceptions import Unauthorized from homeassistant.helpers import entity_registry from homeassistant.setup import async_setup_component -# pylint: disable=protected-access -from tests.async_mock import patch from tests.common import mock_restore_cache diff --git a/tests/components/input_select/test_init.py b/tests/components/input_select/test_init.py index 6f83de340f3..5c470ca5bfc 100644 --- a/tests/components/input_select/test_init.py +++ b/tests/components/input_select/test_init.py @@ -1,4 +1,7 @@ """The tests for the Input select component.""" +# pylint: disable=protected-access +from unittest.mock import patch + import pytest from homeassistant.components.input_select import ( @@ -25,8 +28,6 @@ from homeassistant.helpers import entity_registry from homeassistant.loader import bind_hass from homeassistant.setup import async_setup_component -# pylint: disable=protected-access -from tests.async_mock import patch from tests.common import mock_restore_cache diff --git a/tests/components/input_text/test_init.py b/tests/components/input_text/test_init.py index ed89ccd7087..cc226dc1d87 100644 --- a/tests/components/input_text/test_init.py +++ b/tests/components/input_text/test_init.py @@ -1,4 +1,7 @@ """The tests for the Input text component.""" +# pylint: disable=protected-access +from unittest.mock import patch + import pytest from homeassistant.components.input_text import ( @@ -26,8 +29,6 @@ from homeassistant.helpers import entity_registry from homeassistant.loader import bind_hass from homeassistant.setup import async_setup_component -# pylint: disable=protected-access -from tests.async_mock import patch from tests.common import mock_restore_cache TEST_VAL_MIN = 2 diff --git a/tests/components/insteon/mock_devices.py b/tests/components/insteon/mock_devices.py index f2afd6083a3..7ffb0672161 100644 --- a/tests/components/insteon/mock_devices.py +++ b/tests/components/insteon/mock_devices.py @@ -1,4 +1,6 @@ """Mock devices object to test Insteon.""" +from unittest.mock import AsyncMock, MagicMock + from pyinsteon.address import Address from pyinsteon.device_types import ( GeneralController_MiniRemote_4, @@ -6,8 +8,6 @@ from pyinsteon.device_types import ( SwitchedLightingControl_SwitchLinc, ) -from tests.async_mock import AsyncMock, MagicMock - class MockSwitchLinc(SwitchedLightingControl_SwitchLinc): """Mock SwitchLinc device.""" diff --git a/tests/components/insteon/test_config_flow.py b/tests/components/insteon/test_config_flow.py index 4e060b0d840..f1940b1eb39 100644 --- a/tests/components/insteon/test_config_flow.py +++ b/tests/components/insteon/test_config_flow.py @@ -1,5 +1,7 @@ """Test the config flow for the Insteon integration.""" +from unittest.mock import patch + from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.insteon.config_flow import ( HUB1, @@ -50,7 +52,6 @@ from .const import ( PATCH_CONNECTION, ) -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/insteon/test_init.py b/tests/components/insteon/test_init.py index 73620df6776..01546453868 100644 --- a/tests/components/insteon/test_init.py +++ b/tests/components/insteon/test_init.py @@ -1,5 +1,6 @@ """Test the init file for the Insteon component.""" import asyncio +from unittest.mock import patch from pyinsteon.address import Address @@ -40,7 +41,6 @@ from .const import ( ) from .mock_devices import MockDevices -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/integration/test_sensor.py b/tests/components/integration/test_sensor.py index c36a718ffb4..3afa5c14c22 100644 --- a/tests/components/integration/test_sensor.py +++ b/tests/components/integration/test_sensor.py @@ -1,12 +1,11 @@ """The tests for the integration sensor platform.""" from datetime import timedelta +from unittest.mock import patch from homeassistant.const import ENERGY_KILO_WATT_HOUR, POWER_WATT, TIME_SECONDS from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch - async def test_state(hass): """Test integration sensor state.""" diff --git a/tests/components/ipma/test_config_flow.py b/tests/components/ipma/test_config_flow.py index 98c1667b2f6..493bcfe28cf 100644 --- a/tests/components/ipma/test_config_flow.py +++ b/tests/components/ipma/test_config_flow.py @@ -1,5 +1,7 @@ """Tests for IPMA config flow.""" +from unittest.mock import Mock, patch + from homeassistant.components.ipma import DOMAIN, config_flow from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, CONF_MODE from homeassistant.helpers import entity_registry @@ -7,7 +9,6 @@ from homeassistant.setup import async_setup_component from .test_weather import MockLocation -from tests.async_mock import Mock, patch from tests.common import MockConfigEntry, mock_registry diff --git a/tests/components/ipma/test_weather.py b/tests/components/ipma/test_weather.py index 02e46816bbc..7ed1c4d3723 100644 --- a/tests/components/ipma/test_weather.py +++ b/tests/components/ipma/test_weather.py @@ -1,5 +1,6 @@ """The tests for the IPMA weather component.""" from collections import namedtuple +from unittest.mock import patch from homeassistant.components import weather from homeassistant.components.weather import ( @@ -21,7 +22,6 @@ from homeassistant.components.weather import ( from homeassistant.setup import async_setup_component from homeassistant.util.dt import now -from tests.async_mock import patch from tests.common import MockConfigEntry TEST_CONFIG = { diff --git a/tests/components/ipp/test_config_flow.py b/tests/components/ipp/test_config_flow.py index 24ead324243..140570c3c54 100644 --- a/tests/components/ipp/test_config_flow.py +++ b/tests/components/ipp/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for the IPP config flow.""" +from unittest.mock import patch + from homeassistant.components.ipp.const import CONF_BASE_PATH, CONF_UUID, DOMAIN from homeassistant.config_entries import SOURCE_USER, SOURCE_ZEROCONF from homeassistant.const import CONF_HOST, CONF_NAME, CONF_SSL @@ -17,7 +19,6 @@ from . import ( mock_connection, ) -from tests.async_mock import patch from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/ipp/test_sensor.py b/tests/components/ipp/test_sensor.py index 1817a66f630..69143faec64 100644 --- a/tests/components/ipp/test_sensor.py +++ b/tests/components/ipp/test_sensor.py @@ -1,5 +1,6 @@ """Tests for the IPP sensor platform.""" from datetime import datetime +from unittest.mock import patch from homeassistant.components.ipp.const import DOMAIN from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN @@ -7,7 +8,6 @@ from homeassistant.const import ATTR_ICON, ATTR_UNIT_OF_MEASUREMENT, PERCENTAGE from homeassistant.core import HomeAssistant from homeassistant.util import dt as dt_util -from tests.async_mock import patch from tests.components.ipp import init_integration, mock_connection from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/iqvia/test_config_flow.py b/tests/components/iqvia/test_config_flow.py index 209f88cf895..5cc71302bc5 100644 --- a/tests/components/iqvia/test_config_flow.py +++ b/tests/components/iqvia/test_config_flow.py @@ -1,9 +1,10 @@ """Define tests for the IQVIA config flow.""" +from unittest.mock import patch + from homeassistant import data_entry_flow from homeassistant.components.iqvia import CONF_ZIP_CODE, DOMAIN from homeassistant.config_entries import SOURCE_USER -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/islamic_prayer_times/test_config_flow.py b/tests/components/islamic_prayer_times/test_config_flow.py index 3b966c9e861..b7a942e4f14 100644 --- a/tests/components/islamic_prayer_times/test_config_flow.py +++ b/tests/components/islamic_prayer_times/test_config_flow.py @@ -1,11 +1,12 @@ """Tests for Islamic Prayer Times config flow.""" +from unittest.mock import patch + import pytest from homeassistant import data_entry_flow from homeassistant.components import islamic_prayer_times from homeassistant.components.islamic_prayer_times.const import CONF_CALC_METHOD, DOMAIN -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/islamic_prayer_times/test_init.py b/tests/components/islamic_prayer_times/test_init.py index fd0de854056..850edc4b76d 100644 --- a/tests/components/islamic_prayer_times/test_init.py +++ b/tests/components/islamic_prayer_times/test_init.py @@ -1,6 +1,7 @@ """Tests for Islamic Prayer Times init.""" from datetime import timedelta +from unittest.mock import patch from prayer_times_calculator.exceptions import InvalidResponseError @@ -16,7 +17,6 @@ from . import ( PRAYER_TIMES_TIMESTAMPS, ) -from tests.async_mock import patch from tests.common import MockConfigEntry, async_fire_time_changed diff --git a/tests/components/islamic_prayer_times/test_sensor.py b/tests/components/islamic_prayer_times/test_sensor.py index 13b69207cde..da89436a7e0 100644 --- a/tests/components/islamic_prayer_times/test_sensor.py +++ b/tests/components/islamic_prayer_times/test_sensor.py @@ -1,10 +1,11 @@ """The tests for the Islamic prayer times sensor platform.""" +from unittest.mock import patch + from homeassistant.components import islamic_prayer_times import homeassistant.util.dt as dt_util from . import NOW, PRAYER_TIMES, PRAYER_TIMES_TIMESTAMPS -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/isy994/test_config_flow.py b/tests/components/isy994/test_config_flow.py index 2fe19a0a9fd..c2236006b39 100644 --- a/tests/components/isy994/test_config_flow.py +++ b/tests/components/isy994/test_config_flow.py @@ -1,5 +1,7 @@ """Test the Universal Devices ISY994 config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components import ssdp from homeassistant.components.isy994.config_flow import CannotConnect @@ -17,7 +19,6 @@ from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_SSDP from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME from homeassistant.helpers.typing import HomeAssistantType -from tests.async_mock import patch from tests.common import MockConfigEntry MOCK_HOSTNAME = "1.1.1.1" diff --git a/tests/components/izone/test_config_flow.py b/tests/components/izone/test_config_flow.py index df5ec18db8a..a548e59930b 100644 --- a/tests/components/izone/test_config_flow.py +++ b/tests/components/izone/test_config_flow.py @@ -1,12 +1,12 @@ """Tests for iZone.""" +from unittest.mock import Mock, patch + import pytest from homeassistant import config_entries, data_entry_flow from homeassistant.components.izone.const import DISPATCH_CONTROLLER_DISCOVERED, IZONE -from tests.async_mock import Mock, patch - @pytest.fixture def mock_disco(): diff --git a/tests/components/jewish_calendar/__init__.py b/tests/components/jewish_calendar/__init__.py index c5fc2683923..2d42458cf1b 100644 --- a/tests/components/jewish_calendar/__init__.py +++ b/tests/components/jewish_calendar/__init__.py @@ -2,12 +2,11 @@ from collections import namedtuple from contextlib import contextmanager from datetime import datetime +from unittest.mock import patch from homeassistant.components import jewish_calendar import homeassistant.util.dt as dt_util -from tests.async_mock import patch - _LatLng = namedtuple("_LatLng", ["lat", "lng"]) HDATE_DEFAULT_ALTITUDE = 754 diff --git a/tests/components/juicenet/test_config_flow.py b/tests/components/juicenet/test_config_flow.py index 3a7d2f06c43..817ae04aa79 100644 --- a/tests/components/juicenet/test_config_flow.py +++ b/tests/components/juicenet/test_config_flow.py @@ -1,4 +1,6 @@ """Test the JuiceNet config flow.""" +from unittest.mock import MagicMock, patch + import aiohttp from pyjuicenet import TokenError @@ -6,8 +8,6 @@ from homeassistant import config_entries, setup from homeassistant.components.juicenet.const import DOMAIN from homeassistant.const import CONF_ACCESS_TOKEN -from tests.async_mock import MagicMock, patch - def _mock_juicenet_return_value(get_devices=None): juicenet_mock = MagicMock() diff --git a/tests/components/kira/test_init.py b/tests/components/kira/test_init.py index db8eb6b2456..93f3ee4d82a 100644 --- a/tests/components/kira/test_init.py +++ b/tests/components/kira/test_init.py @@ -3,14 +3,13 @@ import os import shutil import tempfile +from unittest.mock import MagicMock, patch import pytest import homeassistant.components.kira as kira from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, patch - TEST_CONFIG = { kira.DOMAIN: { "sensors": [ diff --git a/tests/components/kira/test_remote.py b/tests/components/kira/test_remote.py index c946823474c..e91cbaca891 100644 --- a/tests/components/kira/test_remote.py +++ b/tests/components/kira/test_remote.py @@ -1,9 +1,9 @@ """The tests for Kira sensor platform.""" import unittest +from unittest.mock import MagicMock from homeassistant.components.kira import remote as kira -from tests.async_mock import MagicMock from tests.common import get_test_home_assistant SERVICE_SEND_COMMAND = "send_command" diff --git a/tests/components/kira/test_sensor.py b/tests/components/kira/test_sensor.py index 21572a8735b..cd4bee60ae6 100644 --- a/tests/components/kira/test_sensor.py +++ b/tests/components/kira/test_sensor.py @@ -1,9 +1,9 @@ """The tests for Kira sensor platform.""" import unittest +from unittest.mock import MagicMock from homeassistant.components.kira import sensor as kira -from tests.async_mock import MagicMock from tests.common import get_test_home_assistant TEST_CONFIG = {kira.DOMAIN: {"sensors": [{"host": "127.0.0.1", "port": 17324}]}} diff --git a/tests/components/kodi/__init__.py b/tests/components/kodi/__init__.py index 31c9dff14ac..bef576dd6bf 100644 --- a/tests/components/kodi/__init__.py +++ b/tests/components/kodi/__init__.py @@ -1,4 +1,6 @@ """Tests for the Kodi integration.""" +from unittest.mock import patch + from homeassistant.components.kodi.const import CONF_WS_PORT, DOMAIN from homeassistant.const import ( CONF_HOST, @@ -11,7 +13,6 @@ from homeassistant.const import ( from .util import MockConnection -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/kodi/test_config_flow.py b/tests/components/kodi/test_config_flow.py index 9e892033786..cba567e5bb5 100644 --- a/tests/components/kodi/test_config_flow.py +++ b/tests/components/kodi/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Kodi config flow.""" +from unittest.mock import AsyncMock, PropertyMock, patch + import pytest from homeassistant import config_entries @@ -21,7 +23,6 @@ from .util import ( get_kodi_connection, ) -from tests.async_mock import AsyncMock, PropertyMock, patch from tests.common import MockConfigEntry diff --git a/tests/components/kodi/test_init.py b/tests/components/kodi/test_init.py index b272e005012..aa206270d35 100644 --- a/tests/components/kodi/test_init.py +++ b/tests/components/kodi/test_init.py @@ -1,11 +1,11 @@ """Test the Kodi integration init.""" +from unittest.mock import patch + from homeassistant.components.kodi.const import DOMAIN from homeassistant.config_entries import ENTRY_STATE_LOADED, ENTRY_STATE_NOT_LOADED from . import init_integration -from tests.async_mock import patch - async def test_unload_entry(hass): """Test successful unload of entry.""" diff --git a/tests/components/konnected/test_config_flow.py b/tests/components/konnected/test_config_flow.py index dfd4600f1fb..4b5cc602f99 100644 --- a/tests/components/konnected/test_config_flow.py +++ b/tests/components/konnected/test_config_flow.py @@ -1,10 +1,11 @@ """Tests for Konnected Alarm Panel config flow.""" +from unittest.mock import patch + import pytest from homeassistant.components import konnected from homeassistant.components.konnected import config_flow -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/konnected/test_init.py b/tests/components/konnected/test_init.py index c198812a82b..91d6633cf1d 100644 --- a/tests/components/konnected/test_init.py +++ b/tests/components/konnected/test_init.py @@ -1,4 +1,6 @@ """Test Konnected setup process.""" +from unittest.mock import patch + import pytest from homeassistant.components import konnected @@ -7,7 +9,6 @@ from homeassistant.config import async_process_ha_core_config from homeassistant.const import HTTP_NOT_FOUND from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/konnected/test_panel.py b/tests/components/konnected/test_panel.py index 21351cb6be3..38507aa973c 100644 --- a/tests/components/konnected/test_panel.py +++ b/tests/components/konnected/test_panel.py @@ -1,5 +1,6 @@ """Test Konnected setup process.""" from datetime import timedelta +from unittest.mock import patch import pytest @@ -7,7 +8,6 @@ from homeassistant.components.konnected import config_flow, panel from homeassistant.setup import async_setup_component from homeassistant.util import utcnow -from tests.async_mock import patch from tests.common import MockConfigEntry, async_fire_time_changed diff --git a/tests/components/kulersky/test_config_flow.py b/tests/components/kulersky/test_config_flow.py index 59e3188fd7e..24f3f9a010e 100644 --- a/tests/components/kulersky/test_config_flow.py +++ b/tests/components/kulersky/test_config_flow.py @@ -1,11 +1,11 @@ """Test the Kuler Sky config flow.""" +from unittest.mock import patch + import pykulersky from homeassistant import config_entries, setup from homeassistant.components.kulersky.config_flow import DOMAIN -from tests.async_mock import patch - async def test_flow_success(hass): """Test we get the form.""" diff --git a/tests/components/kulersky/test_light.py b/tests/components/kulersky/test_light.py index 5403f7cedde..fd5db92908b 100644 --- a/tests/components/kulersky/test_light.py +++ b/tests/components/kulersky/test_light.py @@ -1,5 +1,6 @@ """Test the Kuler Sky lights.""" import asyncio +from unittest.mock import MagicMock, patch import pykulersky import pytest @@ -27,7 +28,6 @@ from homeassistant.const import ( ) import homeassistant.util.dt as dt_util -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry, async_fire_time_changed diff --git a/tests/components/lastfm/test_sensor.py b/tests/components/lastfm/test_sensor.py index 82c789415bf..af7a177edb8 100644 --- a/tests/components/lastfm/test_sensor.py +++ b/tests/components/lastfm/test_sensor.py @@ -1,4 +1,6 @@ """Tests for the lastfm sensor.""" +from unittest.mock import patch + from pylast import Track import pytest @@ -6,8 +8,6 @@ from homeassistant.components import sensor from homeassistant.components.lastfm.sensor import STATE_NOT_SCROBBLING from homeassistant.setup import async_setup_component -from tests.async_mock import patch - class MockUser: """Mock user object for pylast.""" diff --git a/tests/components/light/conftest.py b/tests/components/light/conftest.py index 67af99a3d6c..4ce72f441c2 100644 --- a/tests/components/light/conftest.py +++ b/tests/components/light/conftest.py @@ -1,11 +1,11 @@ """Light conftest.""" +from unittest.mock import AsyncMock, patch + import pytest from homeassistant.components.light import Profiles -from tests.async_mock import AsyncMock, patch - @pytest.fixture(autouse=True) def mock_light_profiles(): diff --git a/tests/components/light/test_device_condition.py b/tests/components/light/test_device_condition.py index eea443b7d34..2a877478b1e 100644 --- a/tests/components/light/test_device_condition.py +++ b/tests/components/light/test_device_condition.py @@ -1,5 +1,6 @@ """The test for light device automation.""" from datetime import timedelta +from unittest.mock import patch import pytest @@ -10,7 +11,6 @@ from homeassistant.helpers import device_registry from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import ( MockConfigEntry, async_get_device_automation_capabilities, diff --git a/tests/components/locative/test_init.py b/tests/components/locative/test_init.py index 2fa68778f7e..d183cb9814a 100644 --- a/tests/components/locative/test_init.py +++ b/tests/components/locative/test_init.py @@ -1,4 +1,6 @@ """The tests the for Locative device tracker platform.""" +from unittest.mock import patch + import pytest from homeassistant import data_entry_flow @@ -10,8 +12,6 @@ from homeassistant.const import HTTP_OK, HTTP_UNPROCESSABLE_ENTITY from homeassistant.helpers.dispatcher import DATA_DISPATCHER from homeassistant.setup import async_setup_component -from tests.async_mock import patch - # pylint: disable=redefined-outer-name diff --git a/tests/components/logbook/test_init.py b/tests/components/logbook/test_init.py index 36d47115acc..8360759d564 100644 --- a/tests/components/logbook/test_init.py +++ b/tests/components/logbook/test_init.py @@ -3,6 +3,7 @@ import collections from datetime import datetime, timedelta import json +from unittest.mock import Mock, patch import pytest import voluptuous as vol @@ -36,7 +37,6 @@ from homeassistant.helpers.json import JSONEncoder from homeassistant.setup import async_setup_component, setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import Mock, patch from tests.common import get_test_home_assistant, init_recorder_component, mock_platform from tests.components.recorder.common import trigger_db_commit diff --git a/tests/components/logentries/test_init.py b/tests/components/logentries/test_init.py index 22cbfb41c76..3ae25d521cb 100644 --- a/tests/components/logentries/test_init.py +++ b/tests/components/logentries/test_init.py @@ -1,13 +1,13 @@ """The tests for the Logentries component.""" +from unittest.mock import MagicMock, call, patch + import pytest import homeassistant.components.logentries as logentries from homeassistant.const import EVENT_STATE_CHANGED, STATE_OFF, STATE_ON from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, call, patch - async def test_setup_config_full(hass): """Test setup with all data.""" diff --git a/tests/components/logger/test_init.py b/tests/components/logger/test_init.py index 571df44bce5..abb8c9b0de8 100644 --- a/tests/components/logger/test_init.py +++ b/tests/components/logger/test_init.py @@ -1,6 +1,7 @@ """The tests for the Logger component.""" from collections import defaultdict import logging +from unittest.mock import Mock, patch import pytest @@ -8,8 +9,6 @@ from homeassistant.components import logger from homeassistant.components.logger import LOGSEVERITY from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, patch - HASS_NS = "unused.homeassistant" COMPONENTS_NS = f"{HASS_NS}.components" ZONE_NS = f"{COMPONENTS_NS}.zone" diff --git a/tests/components/logi_circle/test_config_flow.py b/tests/components/logi_circle/test_config_flow.py index c743cce7519..28335b93ad9 100644 --- a/tests/components/logi_circle/test_config_flow.py +++ b/tests/components/logi_circle/test_config_flow.py @@ -1,6 +1,6 @@ """Tests for Logi Circle config flow.""" import asyncio -from unittest.mock import Mock, patch +from unittest.mock import AsyncMock, Mock, patch import pytest @@ -13,7 +13,6 @@ from homeassistant.components.logi_circle.config_flow import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock from tests.common import mock_coro diff --git a/tests/components/lovelace/test_dashboard.py b/tests/components/lovelace/test_dashboard.py index b5157dd7c46..dd87e2bc275 100644 --- a/tests/components/lovelace/test_dashboard.py +++ b/tests/components/lovelace/test_dashboard.py @@ -1,11 +1,12 @@ """Test the Lovelace initialization.""" +from unittest.mock import patch + import pytest from homeassistant.components import frontend from homeassistant.components.lovelace import const, dashboard from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import assert_setup_component, async_capture_events diff --git a/tests/components/lovelace/test_resources.py b/tests/components/lovelace/test_resources.py index d32dc9388f1..86c0a052776 100644 --- a/tests/components/lovelace/test_resources.py +++ b/tests/components/lovelace/test_resources.py @@ -1,12 +1,11 @@ """Test Lovelace resources.""" import copy +from unittest.mock import patch import uuid from homeassistant.components.lovelace import dashboard, resources from homeassistant.setup import async_setup_component -from tests.async_mock import patch - RESOURCE_EXAMPLES = [ {"type": "js", "url": "/local/bla.js"}, {"type": "css", "url": "/local/bla.css"}, diff --git a/tests/components/lovelace/test_system_health.py b/tests/components/lovelace/test_system_health.py index b81915083d2..780a0678940 100644 --- a/tests/components/lovelace/test_system_health.py +++ b/tests/components/lovelace/test_system_health.py @@ -1,8 +1,9 @@ """Tests for Lovelace system health.""" +from unittest.mock import patch + from homeassistant.components.lovelace import dashboard from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import get_system_health_info diff --git a/tests/components/luftdaten/test_config_flow.py b/tests/components/luftdaten/test_config_flow.py index f3ee1f6c0f7..4ea55e26aee 100644 --- a/tests/components/luftdaten/test_config_flow.py +++ b/tests/components/luftdaten/test_config_flow.py @@ -1,12 +1,12 @@ """Define tests for the Luftdaten config flow.""" from datetime import timedelta +from unittest.mock import patch from homeassistant import data_entry_flow from homeassistant.components.luftdaten import DOMAIN, config_flow from homeassistant.components.luftdaten.const import CONF_SENSOR_ID from homeassistant.const import CONF_SCAN_INTERVAL, CONF_SHOW_ON_MAP -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/luftdaten/test_init.py b/tests/components/luftdaten/test_init.py index a8ea57cbb6b..ebe5f73669e 100644 --- a/tests/components/luftdaten/test_init.py +++ b/tests/components/luftdaten/test_init.py @@ -1,11 +1,11 @@ """Test the Luftdaten component setup.""" +from unittest.mock import patch + from homeassistant.components import luftdaten from homeassistant.components.luftdaten.const import CONF_SENSOR_ID, DOMAIN from homeassistant.const import CONF_SCAN_INTERVAL, CONF_SHOW_ON_MAP from homeassistant.setup import async_setup_component -from tests.async_mock import patch - async def test_config_with_sensor_passed_to_config_entry(hass): """Test that configured options for a sensor are loaded.""" diff --git a/tests/components/lutron_caseta/test_config_flow.py b/tests/components/lutron_caseta/test_config_flow.py index 4ec5f14237c..69f96ca1133 100644 --- a/tests/components/lutron_caseta/test_config_flow.py +++ b/tests/components/lutron_caseta/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Lutron Caseta config flow.""" +from unittest.mock import AsyncMock, patch + from pylutron_caseta.smartbridge import Smartbridge from homeassistant import config_entries, data_entry_flow @@ -13,7 +15,6 @@ from homeassistant.components.lutron_caseta.const import ( ) from homeassistant.const import CONF_HOST -from tests.async_mock import AsyncMock, patch from tests.common import MockConfigEntry diff --git a/tests/components/manual/test_alarm_control_panel.py b/tests/components/manual/test_alarm_control_panel.py index 9cf76ebbc8f..ee3d97e52d7 100644 --- a/tests/components/manual/test_alarm_control_panel.py +++ b/tests/components/manual/test_alarm_control_panel.py @@ -1,5 +1,6 @@ """The tests for the manual Alarm Control Panel component.""" from datetime import timedelta +from unittest.mock import MagicMock, patch from homeassistant.components import alarm_control_panel from homeassistant.components.demo import alarm_control_panel as demo @@ -17,7 +18,6 @@ from homeassistant.core import CoreState, State from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import MagicMock, patch from tests.common import async_fire_time_changed, mock_component, mock_restore_cache from tests.components.alarm_control_panel import common diff --git a/tests/components/manual_mqtt/test_alarm_control_panel.py b/tests/components/manual_mqtt/test_alarm_control_panel.py index 87a887b0751..9a98af127ea 100644 --- a/tests/components/manual_mqtt/test_alarm_control_panel.py +++ b/tests/components/manual_mqtt/test_alarm_control_panel.py @@ -1,5 +1,6 @@ """The tests for the manual_mqtt Alarm Control Panel component.""" from datetime import timedelta +from unittest.mock import patch from homeassistant.components import alarm_control_panel from homeassistant.const import ( @@ -13,7 +14,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import ( assert_setup_component, async_fire_mqtt_message, diff --git a/tests/components/marytts/test_tts.py b/tests/components/marytts/test_tts.py index ce2092dd607..6a09ff405c8 100644 --- a/tests/components/marytts/test_tts.py +++ b/tests/components/marytts/test_tts.py @@ -2,6 +2,7 @@ import asyncio import os import shutil +from unittest.mock import patch from homeassistant.components.media_player.const import ( ATTR_MEDIA_CONTENT_ID, @@ -12,7 +13,6 @@ import homeassistant.components.tts as tts from homeassistant.config import async_process_ha_core_config from homeassistant.setup import setup_component -from tests.async_mock import patch from tests.common import assert_setup_component, get_test_home_assistant, mock_service diff --git a/tests/components/media_player/test_init.py b/tests/components/media_player/test_init.py index 9434fb1a411..98b54ace01f 100644 --- a/tests/components/media_player/test_init.py +++ b/tests/components/media_player/test_init.py @@ -1,12 +1,11 @@ """Test the base functions of the media player.""" import base64 +from unittest.mock import patch from homeassistant.components import media_player from homeassistant.components.websocket_api.const import TYPE_RESULT from homeassistant.setup import async_setup_component -from tests.async_mock import patch - async def test_get_image(hass, hass_ws_client, caplog): """Test get image via WS command.""" diff --git a/tests/components/media_source/test_init.py b/tests/components/media_source/test_init.py index a891fb0d11d..0dda9f67fbe 100644 --- a/tests/components/media_source/test_init.py +++ b/tests/components/media_source/test_init.py @@ -1,4 +1,6 @@ """Test Media Source initialization.""" +from unittest.mock import patch + import pytest from homeassistant.components import media_source @@ -8,8 +10,6 @@ from homeassistant.components.media_source import const from homeassistant.components.media_source.error import Unresolvable from homeassistant.setup import async_setup_component -from tests.async_mock import patch - async def test_is_media_source_id(): """Test media source validation.""" diff --git a/tests/components/melcloud/test_config_flow.py b/tests/components/melcloud/test_config_flow.py index 1fca3ac877e..dbf7a455791 100644 --- a/tests/components/melcloud/test_config_flow.py +++ b/tests/components/melcloud/test_config_flow.py @@ -1,5 +1,6 @@ """Test the MELCloud config flow.""" import asyncio +from unittest.mock import patch from aiohttp import ClientError, ClientResponseError import pymelcloud @@ -9,7 +10,6 @@ from homeassistant import config_entries from homeassistant.components.melcloud.const import DOMAIN from homeassistant.const import HTTP_FORBIDDEN, HTTP_INTERNAL_SERVER_ERROR -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/melissa/test_climate.py b/tests/components/melissa/test_climate.py index 874cc29ab7a..ccb5f951fa2 100644 --- a/tests/components/melissa/test_climate.py +++ b/tests/components/melissa/test_climate.py @@ -1,5 +1,6 @@ """Test for Melissa climate component.""" import json +from unittest.mock import AsyncMock, Mock, patch from homeassistant.components.climate.const import ( HVAC_MODE_COOL, @@ -15,7 +16,6 @@ from homeassistant.components.melissa import DATA_MELISSA, climate as melissa from homeassistant.components.melissa.climate import MelissaClimate from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS -from tests.async_mock import AsyncMock, Mock, patch from tests.common import load_fixture _SERIAL = "12345678" diff --git a/tests/components/melissa/test_init.py b/tests/components/melissa/test_init.py index b9e09a5d769..8ac48cbfd5d 100644 --- a/tests/components/melissa/test_init.py +++ b/tests/components/melissa/test_init.py @@ -1,7 +1,7 @@ """The test for the Melissa Climate component.""" -from homeassistant.components import melissa +from unittest.mock import AsyncMock, patch -from tests.async_mock import AsyncMock, patch +from homeassistant.components import melissa VALID_CONFIG = {"melissa": {"username": "********", "password": "********"}} diff --git a/tests/components/met/__init__.py b/tests/components/met/__init__.py index c238fec4cb7..13b186f3b47 100644 --- a/tests/components/met/__init__.py +++ b/tests/components/met/__init__.py @@ -1,8 +1,9 @@ """Tests for Met.no.""" +from unittest.mock import patch + from homeassistant.components.met.const import DOMAIN from homeassistant.const import CONF_ELEVATION, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/met/conftest.py b/tests/components/met/conftest.py index 164a8498465..e6b975023d1 100644 --- a/tests/components/met/conftest.py +++ b/tests/components/met/conftest.py @@ -1,7 +1,7 @@ """Fixtures for Met weather testing.""" -import pytest +from unittest.mock import AsyncMock, patch -from tests.async_mock import AsyncMock, patch +import pytest @pytest.fixture diff --git a/tests/components/met/test_config_flow.py b/tests/components/met/test_config_flow.py index 52959428917..622475e8376 100644 --- a/tests/components/met/test_config_flow.py +++ b/tests/components/met/test_config_flow.py @@ -1,10 +1,11 @@ """Tests for Met.no config flow.""" +from unittest.mock import patch + import pytest from homeassistant.components.met.const import DOMAIN, HOME_LOCATION_NAME from homeassistant.const import CONF_ELEVATION, CONF_LATITUDE, CONF_LONGITUDE -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/meteo_france/conftest.py b/tests/components/meteo_france/conftest.py index 06a65b6ba87..0b62a03a53c 100644 --- a/tests/components/meteo_france/conftest.py +++ b/tests/components/meteo_france/conftest.py @@ -1,7 +1,7 @@ """Meteo-France generic test utils.""" -import pytest +from unittest.mock import patch -from tests.async_mock import patch +import pytest @pytest.fixture(autouse=True) diff --git a/tests/components/meteo_france/test_config_flow.py b/tests/components/meteo_france/test_config_flow.py index 6c1d9312f91..0fbe1b5e135 100644 --- a/tests/components/meteo_france/test_config_flow.py +++ b/tests/components/meteo_france/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for the Meteo-France config flow.""" +from unittest.mock import patch + from meteofrance_api.model import Place import pytest @@ -13,7 +15,6 @@ from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, CONF_MODE from homeassistant.helpers.typing import HomeAssistantType -from tests.async_mock import patch from tests.common import MockConfigEntry CITY_1_POSTAL = "74220" diff --git a/tests/components/metoffice/conftest.py b/tests/components/metoffice/conftest.py index 9538c7a8668..78d7d2c2eee 100644 --- a/tests/components/metoffice/conftest.py +++ b/tests/components/metoffice/conftest.py @@ -1,9 +1,9 @@ """Fixtures for Met Office weather integration tests.""" +from unittest.mock import patch + from datapoint.exceptions import APIException import pytest -from tests.async_mock import patch - @pytest.fixture() def mock_simple_manager_fail(): diff --git a/tests/components/metoffice/test_config_flow.py b/tests/components/metoffice/test_config_flow.py index 3f248704fa1..f0023b0d8d5 100644 --- a/tests/components/metoffice/test_config_flow.py +++ b/tests/components/metoffice/test_config_flow.py @@ -1,5 +1,6 @@ """Test the National Weather Service (NWS) config flow.""" import json +from unittest.mock import patch from homeassistant import config_entries, setup from homeassistant.components.metoffice.const import DOMAIN @@ -12,7 +13,6 @@ from .const import ( TEST_SITE_NAME_WAVERTREE, ) -from tests.async_mock import patch from tests.common import MockConfigEntry, load_fixture diff --git a/tests/components/metoffice/test_sensor.py b/tests/components/metoffice/test_sensor.py index 43dbf3f75e0..43f460056f9 100644 --- a/tests/components/metoffice/test_sensor.py +++ b/tests/components/metoffice/test_sensor.py @@ -1,5 +1,6 @@ """The tests for the Met Office sensor component.""" import json +from unittest.mock import patch from homeassistant.components.metoffice.const import ATTRIBUTION, DOMAIN @@ -15,7 +16,6 @@ from .const import ( WAVERTREE_SENSOR_RESULTS, ) -from tests.async_mock import patch from tests.common import MockConfigEntry, load_fixture diff --git a/tests/components/metoffice/test_weather.py b/tests/components/metoffice/test_weather.py index f1530021fcf..18edbc4a972 100644 --- a/tests/components/metoffice/test_weather.py +++ b/tests/components/metoffice/test_weather.py @@ -1,6 +1,7 @@ """The tests for the Met Office sensor component.""" from datetime import timedelta import json +from unittest.mock import patch from homeassistant.components.metoffice.const import DOMAIN from homeassistant.const import STATE_UNAVAILABLE @@ -13,7 +14,6 @@ from .const import ( WAVERTREE_SENSOR_RESULTS, ) -from tests.async_mock import patch from tests.common import MockConfigEntry, async_fire_time_changed, load_fixture diff --git a/tests/components/mfi/test_sensor.py b/tests/components/mfi/test_sensor.py index ad23039237c..610aa91cd4c 100644 --- a/tests/components/mfi/test_sensor.py +++ b/tests/components/mfi/test_sensor.py @@ -1,4 +1,6 @@ """The tests for the mFi sensor platform.""" +import unittest.mock as mock + from mficlient.client import FailedToLogin import pytest import requests @@ -8,8 +10,6 @@ import homeassistant.components.sensor as sensor_component from homeassistant.const import TEMP_CELSIUS from homeassistant.setup import async_setup_component -import tests.async_mock as mock - PLATFORM = mfi COMPONENT = sensor_component THING = "sensor" diff --git a/tests/components/mfi/test_switch.py b/tests/components/mfi/test_switch.py index b11dcdccb6e..0409a4f387a 100644 --- a/tests/components/mfi/test_switch.py +++ b/tests/components/mfi/test_switch.py @@ -1,12 +1,12 @@ """The tests for the mFi switch platform.""" +import unittest.mock as mock + import pytest import homeassistant.components.mfi.switch as mfi import homeassistant.components.switch as switch_component from homeassistant.setup import async_setup_component -import tests.async_mock as mock - PLATFORM = mfi COMPONENT = switch_component THING = "switch" diff --git a/tests/components/mhz19/test_sensor.py b/tests/components/mhz19/test_sensor.py index 6305f86cedc..5b6e1e9fa37 100644 --- a/tests/components/mhz19/test_sensor.py +++ b/tests/components/mhz19/test_sensor.py @@ -1,4 +1,6 @@ """Tests for MH-Z19 sensor.""" +from unittest.mock import DEFAULT, Mock, patch + from pmsensor import co2sensor from pmsensor.co2sensor import read_mh_z19_with_temperature @@ -11,7 +13,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import DEFAULT, Mock, patch from tests.common import assert_setup_component diff --git a/tests/components/microsoft_face/test_init.py b/tests/components/microsoft_face/test_init.py index abd35eca3e1..191c59e556f 100644 --- a/tests/components/microsoft_face/test_init.py +++ b/tests/components/microsoft_face/test_init.py @@ -1,5 +1,6 @@ """The tests for the microsoft face platform.""" import asyncio +from unittest.mock import patch from homeassistant.components import camera, microsoft_face as mf from homeassistant.components.microsoft_face import ( @@ -17,7 +18,6 @@ from homeassistant.components.microsoft_face import ( from homeassistant.const import ATTR_NAME from homeassistant.setup import setup_component -from tests.async_mock import patch from tests.common import assert_setup_component, get_test_home_assistant, load_fixture diff --git a/tests/components/mikrotik/test_config_flow.py b/tests/components/mikrotik/test_config_flow.py index ad3a27d724a..c884315f400 100644 --- a/tests/components/mikrotik/test_config_flow.py +++ b/tests/components/mikrotik/test_config_flow.py @@ -1,5 +1,6 @@ """Test Mikrotik setup process.""" from datetime import timedelta +from unittest.mock import patch import librouteros import pytest @@ -15,7 +16,6 @@ from homeassistant.const import ( CONF_VERIFY_SSL, ) -from tests.async_mock import patch from tests.common import MockConfigEntry DEMO_USER_INPUT = { diff --git a/tests/components/mikrotik/test_hub.py b/tests/components/mikrotik/test_hub.py index ecfb9add717..27c53786519 100644 --- a/tests/components/mikrotik/test_hub.py +++ b/tests/components/mikrotik/test_hub.py @@ -1,4 +1,6 @@ """Test Mikrotik hub.""" +from unittest.mock import patch + import librouteros from homeassistant import config_entries @@ -6,7 +8,6 @@ from homeassistant.components import mikrotik from . import ARP_DATA, DHCP_DATA, MOCK_DATA, MOCK_OPTIONS, WIRELESS_DATA -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/mikrotik/test_init.py b/tests/components/mikrotik/test_init.py index 30df96e89a0..281b70e36be 100644 --- a/tests/components/mikrotik/test_init.py +++ b/tests/components/mikrotik/test_init.py @@ -1,10 +1,11 @@ """Test Mikrotik setup process.""" +from unittest.mock import AsyncMock, Mock, patch + from homeassistant.components import mikrotik from homeassistant.setup import async_setup_component from . import MOCK_DATA -from tests.async_mock import AsyncMock, Mock, patch from tests.common import MockConfigEntry diff --git a/tests/components/mill/test_config_flow.py b/tests/components/mill/test_config_flow.py index ff95af44ff5..ee565d32211 100644 --- a/tests/components/mill/test_config_flow.py +++ b/tests/components/mill/test_config_flow.py @@ -1,10 +1,11 @@ """Tests for Mill config flow.""" +from unittest.mock import patch + import pytest from homeassistant.components.mill.const import DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/min_max/test_sensor.py b/tests/components/min_max/test_sensor.py index 0d3a2e8fdcd..93360d57786 100644 --- a/tests/components/min_max/test_sensor.py +++ b/tests/components/min_max/test_sensor.py @@ -1,6 +1,7 @@ """The test for the min/max sensor platform.""" from os import path import statistics +from unittest.mock import patch from homeassistant import config as hass_config from homeassistant.components.min_max import DOMAIN @@ -15,8 +16,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import patch - VALUES = [17, 20, 15.3] COUNT = len(VALUES) MIN_VALUE = min(VALUES) diff --git a/tests/components/minecraft_server/test_config_flow.py b/tests/components/minecraft_server/test_config_flow.py index 2f8ae5ff0bf..2f3b7781ecf 100644 --- a/tests/components/minecraft_server/test_config_flow.py +++ b/tests/components/minecraft_server/test_config_flow.py @@ -1,6 +1,7 @@ """Test the Minecraft Server config flow.""" import asyncio +from unittest.mock import patch import aiodns from mcstatus.pinger import PingResponse @@ -19,7 +20,6 @@ from homeassistant.data_entry_flow import ( ) from homeassistant.helpers.typing import HomeAssistantType -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/minio/test_minio.py b/tests/components/minio/test_minio.py index 8cde32f7870..de66ee2fafa 100644 --- a/tests/components/minio/test_minio.py +++ b/tests/components/minio/test_minio.py @@ -1,6 +1,7 @@ """Tests for Minio Hass related code.""" import asyncio import json +from unittest.mock import MagicMock, call, patch import pytest @@ -18,7 +19,6 @@ from homeassistant.components.minio import ( from homeassistant.core import callback from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, call, patch from tests.components.minio.common import TEST_EVENT diff --git a/tests/components/mobile_app/test_webhook.py b/tests/components/mobile_app/test_webhook.py index b56b56f239a..831c8250d7a 100644 --- a/tests/components/mobile_app/test_webhook.py +++ b/tests/components/mobile_app/test_webhook.py @@ -1,4 +1,6 @@ """Webhook tests for mobile_app.""" +from unittest.mock import patch + import pytest from homeassistant.components.camera import SUPPORT_STREAM as CAMERA_SUPPORT_STREAM @@ -11,7 +13,6 @@ from homeassistant.setup import async_setup_component from .const import CALL_SERVICE, FIRE_EVENT, REGISTER_CLEARTEXT, RENDER_TEMPLATE, UPDATE -from tests.async_mock import patch from tests.common import async_mock_service diff --git a/tests/components/mochad/test_light.py b/tests/components/mochad/test_light.py index 9d484b2db65..0cb1b022a60 100644 --- a/tests/components/mochad/test_light.py +++ b/tests/components/mochad/test_light.py @@ -1,13 +1,13 @@ """The tests for the mochad light platform.""" +import unittest.mock as mock + import pytest from homeassistant.components import light from homeassistant.components.mochad import light as mochad from homeassistant.setup import async_setup_component -import tests.async_mock as mock - @pytest.fixture(autouse=True) def pymochad_mock(): diff --git a/tests/components/mochad/test_switch.py b/tests/components/mochad/test_switch.py index e8d58233c40..218248c3442 100644 --- a/tests/components/mochad/test_switch.py +++ b/tests/components/mochad/test_switch.py @@ -1,12 +1,12 @@ """The tests for the mochad switch platform.""" +import unittest.mock as mock + import pytest from homeassistant.components import switch from homeassistant.components.mochad import switch as mochad from homeassistant.setup import async_setup_component -import tests.async_mock as mock - @pytest.fixture(autouse=True) def pymochad_mock(): diff --git a/tests/components/modbus/conftest.py b/tests/components/modbus/conftest.py index ce6e6585512..e3a707b7fc9 100644 --- a/tests/components/modbus/conftest.py +++ b/tests/components/modbus/conftest.py @@ -1,5 +1,6 @@ """The tests for the Modbus sensor component.""" from unittest import mock +from unittest.mock import patch import pytest @@ -14,7 +15,6 @@ from homeassistant.const import CONF_PLATFORM, CONF_SCAN_INTERVAL from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import async_fire_time_changed diff --git a/tests/components/monoprice/test_config_flow.py b/tests/components/monoprice/test_config_flow.py index f3530bb2c75..0b954cb6e34 100644 --- a/tests/components/monoprice/test_config_flow.py +++ b/tests/components/monoprice/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Monoprice 6-Zone Amplifier config flow.""" +from unittest.mock import patch + from serial import SerialException from homeassistant import config_entries, data_entry_flow, setup @@ -11,7 +13,6 @@ from homeassistant.components.monoprice.const import ( ) from homeassistant.const import CONF_PORT -from tests.async_mock import patch from tests.common import MockConfigEntry CONFIG = { diff --git a/tests/components/monoprice/test_media_player.py b/tests/components/monoprice/test_media_player.py index 41a33fd095b..d7b505b5279 100644 --- a/tests/components/monoprice/test_media_player.py +++ b/tests/components/monoprice/test_media_player.py @@ -1,5 +1,6 @@ """The tests for Monoprice Media player platform.""" from collections import defaultdict +from unittest.mock import patch from serial import SerialException @@ -34,7 +35,6 @@ from homeassistant.const import ( ) from homeassistant.helpers.entity_component import async_update_entity -from tests.async_mock import patch from tests.common import MockConfigEntry MOCK_CONFIG = {CONF_PORT: "fake port", CONF_SOURCES: {"1": "one", "3": "three"}} diff --git a/tests/components/moon/test_sensor.py b/tests/components/moon/test_sensor.py index 234a8a1e34d..8a0269ba9fe 100644 --- a/tests/components/moon/test_sensor.py +++ b/tests/components/moon/test_sensor.py @@ -1,5 +1,6 @@ """The test for the moon sensor platform.""" from datetime import datetime +from unittest.mock import patch from homeassistant.components.homeassistant import ( DOMAIN as HA_DOMAIN, @@ -9,8 +10,6 @@ from homeassistant.const import ATTR_ENTITY_ID from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch - DAY1 = datetime(2017, 1, 1, 1, tzinfo=dt_util.UTC) DAY2 = datetime(2017, 1, 18, 1, tzinfo=dt_util.UTC) diff --git a/tests/components/motion_blinds/test_config_flow.py b/tests/components/motion_blinds/test_config_flow.py index 4a25026959c..18592421249 100644 --- a/tests/components/motion_blinds/test_config_flow.py +++ b/tests/components/motion_blinds/test_config_flow.py @@ -1,5 +1,6 @@ """Test the Motion Blinds config flow.""" import socket +from unittest.mock import Mock, patch import pytest @@ -8,8 +9,6 @@ from homeassistant.components.motion_blinds.config_flow import DEFAULT_GATEWAY_N from homeassistant.components.motion_blinds.const import DOMAIN from homeassistant.const import CONF_API_KEY, CONF_HOST -from tests.async_mock import Mock, patch - TEST_HOST = "1.2.3.4" TEST_HOST2 = "5.6.7.8" TEST_API_KEY = "12ab345c-d67e-8f" diff --git a/tests/components/mqtt/test_alarm_control_panel.py b/tests/components/mqtt/test_alarm_control_panel.py index 524448e5839..cfb59ba27a7 100644 --- a/tests/components/mqtt/test_alarm_control_panel.py +++ b/tests/components/mqtt/test_alarm_control_panel.py @@ -1,6 +1,7 @@ """The tests the MQTT alarm control panel component.""" import copy import json +from unittest.mock import patch import pytest @@ -43,7 +44,6 @@ from .test_common import ( help_test_update_with_json_attrs_not_dict, ) -from tests.async_mock import patch from tests.common import assert_setup_component, async_fire_mqtt_message from tests.components.alarm_control_panel import common diff --git a/tests/components/mqtt/test_binary_sensor.py b/tests/components/mqtt/test_binary_sensor.py index d4c837de023..bf88b7901e1 100644 --- a/tests/components/mqtt/test_binary_sensor.py +++ b/tests/components/mqtt/test_binary_sensor.py @@ -2,6 +2,7 @@ import copy from datetime import datetime, timedelta import json +from unittest.mock import patch import pytest @@ -40,7 +41,6 @@ from .test_common import ( help_test_update_with_json_attrs_not_dict, ) -from tests.async_mock import patch from tests.common import async_fire_mqtt_message, async_fire_time_changed DEFAULT_CONFIG = { diff --git a/tests/components/mqtt/test_camera.py b/tests/components/mqtt/test_camera.py index 1f3acee119e..13c15796cfd 100644 --- a/tests/components/mqtt/test_camera.py +++ b/tests/components/mqtt/test_camera.py @@ -1,5 +1,6 @@ """The tests for mqtt camera component.""" import json +from unittest.mock import patch import pytest @@ -30,7 +31,6 @@ from .test_common import ( help_test_update_with_json_attrs_not_dict, ) -from tests.async_mock import patch from tests.common import async_fire_mqtt_message DEFAULT_CONFIG = { diff --git a/tests/components/mqtt/test_climate.py b/tests/components/mqtt/test_climate.py index 0a9c1dc6104..97657e9e3e6 100644 --- a/tests/components/mqtt/test_climate.py +++ b/tests/components/mqtt/test_climate.py @@ -1,6 +1,7 @@ """The tests for the mqtt climate component.""" import copy import json +from unittest.mock import call, patch import pytest import voluptuous as vol @@ -49,7 +50,6 @@ from .test_common import ( help_test_update_with_json_attrs_not_dict, ) -from tests.async_mock import call, patch from tests.common import async_fire_mqtt_message from tests.components.climate import common diff --git a/tests/components/mqtt/test_common.py b/tests/components/mqtt/test_common.py index e706bc47418..18320a8c467 100644 --- a/tests/components/mqtt/test_common.py +++ b/tests/components/mqtt/test_common.py @@ -2,6 +2,7 @@ import copy from datetime import datetime import json +from unittest.mock import ANY, patch from homeassistant.components import mqtt from homeassistant.components.mqtt import debug_info @@ -10,7 +11,6 @@ from homeassistant.const import ATTR_ASSUMED_STATE, STATE_UNAVAILABLE from homeassistant.helpers.dispatcher import async_dispatcher_send from homeassistant.setup import async_setup_component -from tests.async_mock import ANY, patch from tests.common import async_fire_mqtt_message, mock_registry DEFAULT_CONFIG_DEVICE_INFO_ID = { diff --git a/tests/components/mqtt/test_config_flow.py b/tests/components/mqtt/test_config_flow.py index 41dc4745528..b41a446a8c0 100644 --- a/tests/components/mqtt/test_config_flow.py +++ b/tests/components/mqtt/test_config_flow.py @@ -1,5 +1,7 @@ """Test config flow.""" +from unittest.mock import patch + import pytest import voluptuous as vol @@ -7,7 +9,6 @@ from homeassistant import data_entry_flow from homeassistant.components import mqtt from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/mqtt/test_cover.py b/tests/components/mqtt/test_cover.py index 629d9674b22..019f0e19911 100644 --- a/tests/components/mqtt/test_cover.py +++ b/tests/components/mqtt/test_cover.py @@ -1,4 +1,6 @@ """The tests for the MQTT cover platform.""" +from unittest.mock import patch + import pytest from homeassistant.components import cover @@ -53,7 +55,6 @@ from .test_common import ( help_test_update_with_json_attrs_not_dict, ) -from tests.async_mock import patch from tests.common import async_fire_mqtt_message DEFAULT_CONFIG = { diff --git a/tests/components/mqtt/test_device_tracker.py b/tests/components/mqtt/test_device_tracker.py index 32f826422a8..c85fcef7dc4 100644 --- a/tests/components/mqtt/test_device_tracker.py +++ b/tests/components/mqtt/test_device_tracker.py @@ -1,11 +1,12 @@ """The tests for the MQTT device tracker platform.""" +from unittest.mock import patch + import pytest from homeassistant.components.device_tracker.const import DOMAIN, SOURCE_TYPE_BLUETOOTH from homeassistant.const import CONF_PLATFORM, STATE_HOME, STATE_NOT_HOME from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import async_fire_mqtt_message diff --git a/tests/components/mqtt/test_discovery.py b/tests/components/mqtt/test_discovery.py index e1365418483..7f22e0eef6f 100644 --- a/tests/components/mqtt/test_discovery.py +++ b/tests/components/mqtt/test_discovery.py @@ -1,6 +1,7 @@ """The tests for the MQTT discovery.""" from pathlib import Path import re +from unittest.mock import AsyncMock, patch import pytest @@ -13,7 +14,6 @@ from homeassistant.components.mqtt.abbreviations import ( from homeassistant.components.mqtt.discovery import ALREADY_DISCOVERED, async_start from homeassistant.const import STATE_OFF, STATE_ON -from tests.async_mock import AsyncMock, patch from tests.common import ( async_fire_mqtt_message, mock_device_registry, diff --git a/tests/components/mqtt/test_fan.py b/tests/components/mqtt/test_fan.py index e1801c5c15a..d52b67fd3ed 100644 --- a/tests/components/mqtt/test_fan.py +++ b/tests/components/mqtt/test_fan.py @@ -1,4 +1,6 @@ """Test MQTT fans.""" +from unittest.mock import patch + import pytest from homeassistant.components import fan @@ -34,7 +36,6 @@ from .test_common import ( help_test_update_with_json_attrs_not_dict, ) -from tests.async_mock import patch from tests.common import async_fire_mqtt_message from tests.components.fan import common diff --git a/tests/components/mqtt/test_init.py b/tests/components/mqtt/test_init.py index 82a88de918b..bb698a24d7e 100644 --- a/tests/components/mqtt/test_init.py +++ b/tests/components/mqtt/test_init.py @@ -3,6 +3,7 @@ import asyncio from datetime import datetime, timedelta import json import ssl +from unittest.mock import AsyncMock, MagicMock, call, mock_open, patch import pytest import voluptuous as vol @@ -21,7 +22,6 @@ from homeassistant.helpers import device_registry from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow -from tests.async_mock import AsyncMock, MagicMock, call, mock_open, patch from tests.common import ( MockConfigEntry, async_fire_mqtt_message, diff --git a/tests/components/mqtt/test_legacy_vacuum.py b/tests/components/mqtt/test_legacy_vacuum.py index aacea4e345e..db25e66c2c2 100644 --- a/tests/components/mqtt/test_legacy_vacuum.py +++ b/tests/components/mqtt/test_legacy_vacuum.py @@ -1,6 +1,7 @@ """The tests for the Legacy Mqtt vacuum platform.""" from copy import deepcopy import json +from unittest.mock import patch import pytest @@ -46,7 +47,6 @@ from .test_common import ( help_test_update_with_json_attrs_not_dict, ) -from tests.async_mock import patch from tests.common import async_fire_mqtt_message from tests.components.vacuum import common diff --git a/tests/components/mqtt/test_light.py b/tests/components/mqtt/test_light.py index 9e044380555..933f49ff823 100644 --- a/tests/components/mqtt/test_light.py +++ b/tests/components/mqtt/test_light.py @@ -155,6 +155,7 @@ light: """ import json from os import path +from unittest.mock import call, patch import pytest @@ -188,7 +189,6 @@ from .test_common import ( help_test_update_with_json_attrs_not_dict, ) -from tests.async_mock import call, patch from tests.common import assert_setup_component, async_fire_mqtt_message from tests.components.light import common diff --git a/tests/components/mqtt/test_light_json.py b/tests/components/mqtt/test_light_json.py index e41575968da..1c9eed0e404 100644 --- a/tests/components/mqtt/test_light_json.py +++ b/tests/components/mqtt/test_light_json.py @@ -88,6 +88,7 @@ light: brightness_scale: 99 """ import json +from unittest.mock import call, patch import pytest @@ -125,7 +126,6 @@ from .test_common import ( help_test_update_with_json_attrs_not_dict, ) -from tests.async_mock import call, patch from tests.common import async_fire_mqtt_message from tests.components.light import common diff --git a/tests/components/mqtt/test_light_template.py b/tests/components/mqtt/test_light_template.py index 6767375a50e..733a39ce252 100644 --- a/tests/components/mqtt/test_light_template.py +++ b/tests/components/mqtt/test_light_template.py @@ -26,6 +26,8 @@ If your light doesn't support white value feature, omit `white_value_template`. If your light doesn't support RGB feature, omit `(red|green|blue)_template`. """ +from unittest.mock import patch + import pytest from homeassistant.components import light @@ -62,7 +64,6 @@ from .test_common import ( help_test_update_with_json_attrs_not_dict, ) -from tests.async_mock import patch from tests.common import assert_setup_component, async_fire_mqtt_message from tests.components.light import common diff --git a/tests/components/mqtt/test_lock.py b/tests/components/mqtt/test_lock.py index cd37543d94e..754f60f49b2 100644 --- a/tests/components/mqtt/test_lock.py +++ b/tests/components/mqtt/test_lock.py @@ -1,4 +1,6 @@ """The tests for the MQTT lock platform.""" +from unittest.mock import patch + import pytest from homeassistant.components.lock import ( @@ -35,7 +37,6 @@ from .test_common import ( help_test_update_with_json_attrs_not_dict, ) -from tests.async_mock import patch from tests.common import async_fire_mqtt_message DEFAULT_CONFIG = { diff --git a/tests/components/mqtt/test_scene.py b/tests/components/mqtt/test_scene.py index 0e3341bd15f..9a233e19fd8 100644 --- a/tests/components/mqtt/test_scene.py +++ b/tests/components/mqtt/test_scene.py @@ -1,6 +1,7 @@ """The tests for the MQTT scene platform.""" import copy import json +from unittest.mock import patch import pytest @@ -21,8 +22,6 @@ from .test_common import ( help_test_unique_id, ) -from tests.async_mock import patch - DEFAULT_CONFIG = { scene.DOMAIN: { "platform": "mqtt", diff --git a/tests/components/mqtt/test_sensor.py b/tests/components/mqtt/test_sensor.py index 7e92579753b..7449d127dc1 100644 --- a/tests/components/mqtt/test_sensor.py +++ b/tests/components/mqtt/test_sensor.py @@ -2,6 +2,7 @@ import copy from datetime import datetime, timedelta import json +from unittest.mock import patch import pytest @@ -42,7 +43,6 @@ from .test_common import ( help_test_update_with_json_attrs_not_dict, ) -from tests.async_mock import patch from tests.common import async_fire_mqtt_message, async_fire_time_changed DEFAULT_CONFIG = { diff --git a/tests/components/mqtt/test_state_vacuum.py b/tests/components/mqtt/test_state_vacuum.py index fe410821395..e18b0b05835 100644 --- a/tests/components/mqtt/test_state_vacuum.py +++ b/tests/components/mqtt/test_state_vacuum.py @@ -1,6 +1,7 @@ """The tests for the State vacuum Mqtt platform.""" from copy import deepcopy import json +from unittest.mock import patch import pytest @@ -56,7 +57,6 @@ from .test_common import ( help_test_update_with_json_attrs_not_dict, ) -from tests.async_mock import patch from tests.common import async_fire_mqtt_message from tests.components.vacuum import common diff --git a/tests/components/mqtt/test_subscription.py b/tests/components/mqtt/test_subscription.py index f1ed26e89cc..36d8946be0b 100644 --- a/tests/components/mqtt/test_subscription.py +++ b/tests/components/mqtt/test_subscription.py @@ -1,11 +1,12 @@ """The tests for the MQTT subscription component.""" +from unittest.mock import ANY + from homeassistant.components.mqtt.subscription import ( async_subscribe_topics, async_unsubscribe_topics, ) from homeassistant.core import callback -from tests.async_mock import ANY from tests.common import async_fire_mqtt_message diff --git a/tests/components/mqtt/test_switch.py b/tests/components/mqtt/test_switch.py index 4d9c6dc2c77..607e4468a5f 100644 --- a/tests/components/mqtt/test_switch.py +++ b/tests/components/mqtt/test_switch.py @@ -1,6 +1,7 @@ """The tests for the MQTT switch platform.""" import copy import json +from unittest.mock import patch import pytest @@ -33,7 +34,6 @@ from .test_common import ( help_test_update_with_json_attrs_not_dict, ) -from tests.async_mock import patch from tests.common import async_fire_mqtt_message from tests.components.switch import common diff --git a/tests/components/mqtt/test_tag.py b/tests/components/mqtt/test_tag.py index bed05ac6384..8ade3146455 100644 --- a/tests/components/mqtt/test_tag.py +++ b/tests/components/mqtt/test_tag.py @@ -1,10 +1,10 @@ """The tests for MQTT tag scanner.""" import copy import json +from unittest.mock import ANY, patch import pytest -from tests.async_mock import ANY, patch from tests.common import ( async_fire_mqtt_message, async_get_device_automations, diff --git a/tests/components/mqtt/test_trigger.py b/tests/components/mqtt/test_trigger.py index a26ecadb6bd..b27af2b9bd0 100644 --- a/tests/components/mqtt/test_trigger.py +++ b/tests/components/mqtt/test_trigger.py @@ -1,11 +1,12 @@ """The tests for the MQTT automation.""" +from unittest.mock import ANY + import pytest import homeassistant.components.automation as automation from homeassistant.const import ATTR_ENTITY_ID, ENTITY_MATCH_ALL, SERVICE_TURN_OFF from homeassistant.setup import async_setup_component -from tests.async_mock import ANY from tests.common import async_fire_mqtt_message, async_mock_service, mock_component from tests.components.blueprint.conftest import stub_blueprint_populate # noqa diff --git a/tests/components/mqtt_eventstream/test_init.py b/tests/components/mqtt_eventstream/test_init.py index 87ac4696a31..da37489a130 100644 --- a/tests/components/mqtt_eventstream/test_init.py +++ b/tests/components/mqtt_eventstream/test_init.py @@ -1,5 +1,6 @@ """The tests for the MQTT eventstream component.""" import json +from unittest.mock import ANY, patch import homeassistant.components.mqtt_eventstream as eventstream from homeassistant.const import EVENT_STATE_CHANGED @@ -8,7 +9,6 @@ from homeassistant.helpers.json import JSONEncoder from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import ANY, patch from tests.common import ( async_fire_mqtt_message, async_fire_time_changed, diff --git a/tests/components/mqtt_json/test_device_tracker.py b/tests/components/mqtt_json/test_device_tracker.py index 89b37e28b52..d17484cc5e9 100644 --- a/tests/components/mqtt_json/test_device_tracker.py +++ b/tests/components/mqtt_json/test_device_tracker.py @@ -2,6 +2,7 @@ import json import logging import os +from unittest.mock import patch import pytest @@ -12,7 +13,6 @@ from homeassistant.components.device_tracker.legacy import ( from homeassistant.const import CONF_PLATFORM from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import async_fire_mqtt_message LOCATION_MESSAGE = { diff --git a/tests/components/mqtt_room/test_sensor.py b/tests/components/mqtt_room/test_sensor.py index e17fbb4847d..ca5f9420dc5 100644 --- a/tests/components/mqtt_room/test_sensor.py +++ b/tests/components/mqtt_room/test_sensor.py @@ -1,6 +1,7 @@ """The tests for the MQTT room presence sensor.""" import datetime import json +from unittest.mock import patch from homeassistant.components.mqtt import CONF_QOS, CONF_STATE_TOPIC, DEFAULT_QOS import homeassistant.components.sensor as sensor @@ -8,7 +9,6 @@ from homeassistant.const import CONF_NAME, CONF_PLATFORM from homeassistant.setup import async_setup_component from homeassistant.util import dt -from tests.async_mock import patch from tests.common import async_fire_mqtt_message DEVICE_ID = "123TESTMAC" diff --git a/tests/components/mqtt_statestream/test_init.py b/tests/components/mqtt_statestream/test_init.py index cea4b492f3e..d7bfcfe4f2e 100644 --- a/tests/components/mqtt_statestream/test_init.py +++ b/tests/components/mqtt_statestream/test_init.py @@ -1,9 +1,10 @@ """The tests for the MQTT statestream component.""" +from unittest.mock import ANY, call + import homeassistant.components.mqtt_statestream as statestream from homeassistant.core import State from homeassistant.setup import async_setup_component -from tests.async_mock import ANY, call from tests.common import mock_state_change_event diff --git a/tests/components/myq/test_config_flow.py b/tests/components/myq/test_config_flow.py index e2c43e8ce5c..edf37895fd3 100644 --- a/tests/components/myq/test_config_flow.py +++ b/tests/components/myq/test_config_flow.py @@ -1,11 +1,12 @@ """Test the MyQ config flow.""" +from unittest.mock import patch + from pymyq.errors import InvalidCredentialsError, MyQError from homeassistant import config_entries, setup from homeassistant.components.myq.const import DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/myq/util.py b/tests/components/myq/util.py index 61c19325d57..84e85723918 100644 --- a/tests/components/myq/util.py +++ b/tests/components/myq/util.py @@ -1,12 +1,12 @@ """Tests for the myq integration.""" import json +from unittest.mock import patch from homeassistant.components.myq.const import DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_USERNAME from homeassistant.core import HomeAssistant -from tests.async_mock import patch from tests.common import MockConfigEntry, load_fixture diff --git a/tests/components/mythicbeastsdns/test_init.py b/tests/components/mythicbeastsdns/test_init.py index e8efac2c01d..01c9b253e4f 100644 --- a/tests/components/mythicbeastsdns/test_init.py +++ b/tests/components/mythicbeastsdns/test_init.py @@ -1,11 +1,10 @@ """Test the Mythic Beasts DNS component.""" import logging +from unittest.mock import patch from homeassistant.components import mythicbeastsdns from homeassistant.setup import async_setup_component -from tests.async_mock import patch - _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/neato/test_config_flow.py b/tests/components/neato/test_config_flow.py index 6954eb1b7af..7c7e25f2e0c 100644 --- a/tests/components/neato/test_config_flow.py +++ b/tests/components/neato/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Neato Botvac config flow.""" +from unittest.mock import patch + from pybotvac.neato import Neato from homeassistant import config_entries, data_entry_flow, setup @@ -6,7 +8,6 @@ from homeassistant.components.neato.const import NEATO_DOMAIN from homeassistant.helpers import config_entry_oauth2_flow from homeassistant.helpers.typing import HomeAssistantType -from tests.async_mock import patch from tests.common import MockConfigEntry CLIENT_ID = "1234" diff --git a/tests/components/ness_alarm/test_init.py b/tests/components/ness_alarm/test_init.py index f959b5345dd..507a786c3d1 100644 --- a/tests/components/ness_alarm/test_init.py +++ b/tests/components/ness_alarm/test_init.py @@ -1,5 +1,6 @@ """Tests for the ness_alarm component.""" from enum import Enum +from unittest.mock import MagicMock, patch import pytest @@ -31,8 +32,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, patch - VALID_CONFIG = { DOMAIN: { CONF_HOST: "alarm.local", diff --git a/tests/components/nest/camera_sdm_test.py b/tests/components/nest/camera_sdm_test.py index 69b413ba51a..07a21eb2b68 100644 --- a/tests/components/nest/camera_sdm_test.py +++ b/tests/components/nest/camera_sdm_test.py @@ -6,6 +6,7 @@ pubsub subscriber. """ import datetime +from unittest.mock import patch import aiohttp from google_nest_sdm.device import Device @@ -18,7 +19,6 @@ from homeassistant.util.dt import utcnow from .common import async_setup_sdm_platform -from tests.async_mock import patch from tests.common import async_fire_time_changed PLATFORM = "camera" diff --git a/tests/components/nest/common.py b/tests/components/nest/common.py index 65a37563911..2721cd08c19 100644 --- a/tests/components/nest/common.py +++ b/tests/components/nest/common.py @@ -2,6 +2,7 @@ import time from typing import Awaitable, Callable +from unittest.mock import patch from google_nest_sdm.device_manager import DeviceManager from google_nest_sdm.event import EventMessage @@ -10,7 +11,6 @@ from google_nest_sdm.google_nest_subscriber import GoogleNestSubscriber from homeassistant.components.nest import DOMAIN from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import MockConfigEntry CONFIG = { diff --git a/tests/components/nest/test_config_flow_legacy.py b/tests/components/nest/test_config_flow_legacy.py index 23e01cf239a..ed4df2c7d84 100644 --- a/tests/components/nest/test_config_flow_legacy.py +++ b/tests/components/nest/test_config_flow_legacy.py @@ -1,12 +1,11 @@ """Tests for the Nest config flow.""" import asyncio -from unittest.mock import Mock, patch +from unittest.mock import AsyncMock, Mock, patch from homeassistant import data_entry_flow from homeassistant.components.nest import DOMAIN, config_flow from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock from tests.common import mock_coro diff --git a/tests/components/nest/test_config_flow_sdm.py b/tests/components/nest/test_config_flow_sdm.py index aad5621935e..f8c9c69698a 100644 --- a/tests/components/nest/test_config_flow_sdm.py +++ b/tests/components/nest/test_config_flow_sdm.py @@ -1,5 +1,7 @@ """Test the Google Nest Device Access config flow.""" +from unittest.mock import patch + import pytest from homeassistant import config_entries, setup @@ -9,8 +11,6 @@ from homeassistant.helpers import config_entry_oauth2_flow from .common import MockConfigEntry -from tests.async_mock import patch - CLIENT_ID = "1234" CLIENT_SECRET = "5678" PROJECT_ID = "project-id-4321" diff --git a/tests/components/nest/test_init_legacy.py b/tests/components/nest/test_init_legacy.py index f85fcdaa749..3a78877a235 100644 --- a/tests/components/nest/test_init_legacy.py +++ b/tests/components/nest/test_init_legacy.py @@ -1,10 +1,10 @@ """Test basic initialization for the Legacy Nest API using mocks for the Nest python library.""" import time +from unittest.mock import MagicMock, PropertyMock, patch from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, PropertyMock, patch from tests.common import MockConfigEntry DOMAIN = "nest" diff --git a/tests/components/nest/test_init_sdm.py b/tests/components/nest/test_init_sdm.py index e49f3b89f27..ee2a7f4f242 100644 --- a/tests/components/nest/test_init_sdm.py +++ b/tests/components/nest/test_init_sdm.py @@ -6,6 +6,7 @@ and failure modes. """ import logging +from unittest.mock import patch from google_nest_sdm.exceptions import AuthException, GoogleNestException @@ -20,7 +21,6 @@ from homeassistant.setup import async_setup_component from .common import CONFIG, CONFIG_ENTRY_DATA, async_setup_sdm_platform -from tests.async_mock import patch from tests.common import MockConfigEntry PLATFORM = "sensor" diff --git a/tests/components/netatmo/test_config_flow.py b/tests/components/netatmo/test_config_flow.py index 74a5d8dcc92..03c751aae96 100644 --- a/tests/components/netatmo/test_config_flow.py +++ b/tests/components/netatmo/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Netatmo config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.netatmo import config_flow from homeassistant.components.netatmo.const import ( @@ -11,7 +13,6 @@ from homeassistant.components.netatmo.const import ( from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET from homeassistant.helpers import config_entry_oauth2_flow -from tests.async_mock import patch from tests.common import MockConfigEntry CLIENT_ID = "1234" diff --git a/tests/components/nexia/test_config_flow.py b/tests/components/nexia/test_config_flow.py index 81536f5beea..d0433eb27f7 100644 --- a/tests/components/nexia/test_config_flow.py +++ b/tests/components/nexia/test_config_flow.py @@ -1,12 +1,12 @@ """Test the nexia config flow.""" +from unittest.mock import MagicMock, patch + from requests.exceptions import ConnectTimeout, HTTPError from homeassistant import config_entries, setup from homeassistant.components.nexia.const import DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import MagicMock, patch - async def test_form(hass): """Test we get the form.""" diff --git a/tests/components/nexia/util.py b/tests/components/nexia/util.py index 7d34f0894e0..8e132941994 100644 --- a/tests/components/nexia/util.py +++ b/tests/components/nexia/util.py @@ -1,4 +1,5 @@ """Tests for the nexia integration.""" +from unittest.mock import patch import uuid from nexia.home import NexiaHome @@ -8,7 +9,6 @@ from homeassistant.components.nexia.const import DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_USERNAME from homeassistant.core import HomeAssistant -from tests.async_mock import patch from tests.common import MockConfigEntry, load_fixture diff --git a/tests/components/nextbus/test_sensor.py b/tests/components/nextbus/test_sensor.py index 4e7f0af8526..016afed2b0f 100644 --- a/tests/components/nextbus/test_sensor.py +++ b/tests/components/nextbus/test_sensor.py @@ -1,5 +1,6 @@ """The tests for the nexbus sensor component.""" from copy import deepcopy +from unittest.mock import patch import pytest @@ -7,7 +8,6 @@ import homeassistant.components.nextbus.sensor as nextbus import homeassistant.components.sensor as sensor from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import assert_setup_component VALID_AGENCY = "sf-muni" diff --git a/tests/components/nightscout/__init__.py b/tests/components/nightscout/__init__.py index c7f15068d1d..6c1a34ebe41 100644 --- a/tests/components/nightscout/__init__.py +++ b/tests/components/nightscout/__init__.py @@ -1,5 +1,6 @@ """Tests for the Nightscout integration.""" import json +from unittest.mock import patch from aiohttp import ClientConnectionError from py_nightscout.models import SGV, ServerStatus @@ -7,7 +8,6 @@ from py_nightscout.models import SGV, ServerStatus from homeassistant.components.nightscout.const import DOMAIN from homeassistant.const import CONF_URL -from tests.async_mock import patch from tests.common import MockConfigEntry GLUCOSE_READINGS = [ diff --git a/tests/components/nightscout/test_config_flow.py b/tests/components/nightscout/test_config_flow.py index 71983f1b29d..9a86e14b4e5 100644 --- a/tests/components/nightscout/test_config_flow.py +++ b/tests/components/nightscout/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Nightscout config flow.""" +from unittest.mock import patch + from aiohttp import ClientConnectionError, ClientResponseError from homeassistant import config_entries, data_entry_flow, setup @@ -6,7 +8,6 @@ from homeassistant.components.nightscout.const import DOMAIN from homeassistant.components.nightscout.utils import hash_from_url from homeassistant.const import CONF_URL -from tests.async_mock import patch from tests.common import MockConfigEntry from tests.components.nightscout import ( GLUCOSE_READINGS, diff --git a/tests/components/nightscout/test_init.py b/tests/components/nightscout/test_init.py index d81559ceba7..88ca141b999 100644 --- a/tests/components/nightscout/test_init.py +++ b/tests/components/nightscout/test_init.py @@ -1,4 +1,6 @@ """Test the Nightscout config flow.""" +from unittest.mock import patch + from aiohttp import ClientError from homeassistant.components.nightscout.const import DOMAIN @@ -9,7 +11,6 @@ from homeassistant.config_entries import ( ) from homeassistant.const import CONF_URL -from tests.async_mock import patch from tests.common import MockConfigEntry from tests.components.nightscout import init_integration diff --git a/tests/components/notion/test_config_flow.py b/tests/components/notion/test_config_flow.py index 728a8d40a52..d9ed37d516c 100644 --- a/tests/components/notion/test_config_flow.py +++ b/tests/components/notion/test_config_flow.py @@ -1,4 +1,6 @@ """Define tests for the Notion config flow.""" +from unittest.mock import AsyncMock, patch + import aionotion import pytest @@ -7,7 +9,6 @@ from homeassistant.components.notion import DOMAIN, config_flow from homeassistant.config_entries import SOURCE_USER from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import AsyncMock, patch from tests.common import MockConfigEntry diff --git a/tests/components/nsw_fuel_station/test_sensor.py b/tests/components/nsw_fuel_station/test_sensor.py index e99a7bfc079..28ff7a7ed95 100644 --- a/tests/components/nsw_fuel_station/test_sensor.py +++ b/tests/components/nsw_fuel_station/test_sensor.py @@ -1,8 +1,9 @@ """The tests for the NSW Fuel Station sensor platform.""" +from unittest.mock import patch + from homeassistant.components import sensor from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import assert_setup_component VALID_CONFIG = { diff --git a/tests/components/nsw_rural_fire_service_feed/test_geo_location.py b/tests/components/nsw_rural_fire_service_feed/test_geo_location.py index b8923d854ee..d8719578957 100644 --- a/tests/components/nsw_rural_fire_service_feed/test_geo_location.py +++ b/tests/components/nsw_rural_fire_service_feed/test_geo_location.py @@ -1,5 +1,6 @@ """The tests for the NSW Rural Fire Service Feeds platform.""" import datetime +from unittest.mock import ANY, MagicMock, call, patch from aio_geojson_nsw_rfs_incidents import NswRuralFireServiceIncidentsFeed @@ -35,7 +36,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import ANY, MagicMock, call, patch from tests.common import assert_setup_component, async_fire_time_changed CONFIG = { diff --git a/tests/components/nuheat/mocks.py b/tests/components/nuheat/mocks.py index ccfb031f043..de87f72fffb 100644 --- a/tests/components/nuheat/mocks.py +++ b/tests/components/nuheat/mocks.py @@ -1,11 +1,11 @@ """The test for the NuHeat thermostat module.""" +from unittest.mock import MagicMock, Mock + from nuheat.config import SCHEDULE_HOLD, SCHEDULE_RUN, SCHEDULE_TEMPORARY_HOLD from homeassistant.components.nuheat.const import DOMAIN from homeassistant.const import CONF_DEVICES, CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import MagicMock, Mock - def _get_mock_thermostat_run(): serial_number = "12345" diff --git a/tests/components/nuheat/test_climate.py b/tests/components/nuheat/test_climate.py index 453f0dab110..e5fc6246841 100644 --- a/tests/components/nuheat/test_climate.py +++ b/tests/components/nuheat/test_climate.py @@ -1,5 +1,6 @@ """The test for the NuHeat thermostat module.""" from datetime import timedelta +from unittest.mock import patch from homeassistant.components.nuheat.const import DOMAIN from homeassistant.const import ATTR_ENTITY_ID @@ -15,7 +16,6 @@ from .mocks import ( _mock_get_config, ) -from tests.async_mock import patch from tests.common import async_fire_time_changed diff --git a/tests/components/nuheat/test_config_flow.py b/tests/components/nuheat/test_config_flow.py index 5b2259faea8..246c7130c94 100644 --- a/tests/components/nuheat/test_config_flow.py +++ b/tests/components/nuheat/test_config_flow.py @@ -1,4 +1,6 @@ """Test the NuHeat config flow.""" +from unittest.mock import MagicMock, patch + import requests from homeassistant import config_entries, setup @@ -7,8 +9,6 @@ from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, HTTP_INTERNAL_SERV from .mocks import _get_mock_thermostat_run -from tests.async_mock import MagicMock, patch - async def test_form_user(hass): """Test we get the form with user source.""" diff --git a/tests/components/nuheat/test_init.py b/tests/components/nuheat/test_init.py index 8cd08f2edd5..dde4fd8c787 100644 --- a/tests/components/nuheat/test_init.py +++ b/tests/components/nuheat/test_init.py @@ -1,11 +1,11 @@ """NuHeat component tests.""" +from unittest.mock import patch + from homeassistant.components.nuheat.const import DOMAIN from homeassistant.setup import async_setup_component from .mocks import _get_mock_nuheat -from tests.async_mock import patch - VALID_CONFIG = { "nuheat": {"username": "warm", "password": "feet", "devices": "thermostat123"} } diff --git a/tests/components/number/test_init.py b/tests/components/number/test_init.py index 58e090db20f..f1154581fdc 100644 --- a/tests/components/number/test_init.py +++ b/tests/components/number/test_init.py @@ -1,7 +1,7 @@ """The tests for the Number component.""" -from homeassistant.components.number import NumberEntity +from unittest.mock import MagicMock -from tests.async_mock import MagicMock +from homeassistant.components.number import NumberEntity class MockDefaultNumberEntity(NumberEntity): diff --git a/tests/components/nut/test_config_flow.py b/tests/components/nut/test_config_flow.py index e003ecd796b..01df325dd2c 100644 --- a/tests/components/nut/test_config_flow.py +++ b/tests/components/nut/test_config_flow.py @@ -1,12 +1,13 @@ """Test the Network UPS Tools (NUT) config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.nut.const import DOMAIN from homeassistant.const import CONF_RESOURCES, CONF_SCAN_INTERVAL from .util import _get_mock_pynutclient -from tests.async_mock import patch from tests.common import MockConfigEntry VALID_CONFIG = { diff --git a/tests/components/nut/util.py b/tests/components/nut/util.py index 772667b6b50..4e7506a9db1 100644 --- a/tests/components/nut/util.py +++ b/tests/components/nut/util.py @@ -1,12 +1,12 @@ """Tests for the nut integration.""" import json +from unittest.mock import MagicMock, patch from homeassistant.components.nut.const import DOMAIN from homeassistant.const import CONF_HOST, CONF_PORT, CONF_RESOURCES from homeassistant.core import HomeAssistant -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry, load_fixture diff --git a/tests/components/nws/conftest.py b/tests/components/nws/conftest.py index 74f84eb200c..d01201bb484 100644 --- a/tests/components/nws/conftest.py +++ b/tests/components/nws/conftest.py @@ -1,7 +1,8 @@ """Fixtures for National Weather Service tests.""" +from unittest.mock import AsyncMock, patch + import pytest -from tests.async_mock import AsyncMock, patch from tests.components.nws.const import DEFAULT_FORECAST, DEFAULT_OBSERVATION diff --git a/tests/components/nws/test_config_flow.py b/tests/components/nws/test_config_flow.py index 2ea5f36a379..81be7360e87 100644 --- a/tests/components/nws/test_config_flow.py +++ b/tests/components/nws/test_config_flow.py @@ -1,11 +1,11 @@ """Test the National Weather Service (NWS) config flow.""" +from unittest.mock import patch + import aiohttp from homeassistant import config_entries, setup from homeassistant.components.nws.const import DOMAIN -from tests.async_mock import patch - async def test_form(hass, mock_simple_nws_config): """Test we get the form.""" diff --git a/tests/components/nws/test_weather.py b/tests/components/nws/test_weather.py index bd8d81a4b0f..c7cb5b81c2a 100644 --- a/tests/components/nws/test_weather.py +++ b/tests/components/nws/test_weather.py @@ -1,5 +1,6 @@ """Tests for the NWS weather component.""" from datetime import timedelta +from unittest.mock import patch import aiohttp import pytest @@ -15,7 +16,6 @@ from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util from homeassistant.util.unit_system import IMPERIAL_SYSTEM, METRIC_SYSTEM -from tests.async_mock import patch from tests.common import MockConfigEntry, async_fire_time_changed from tests.components.nws.const import ( EXPECTED_FORECAST_IMPERIAL, diff --git a/tests/components/nzbget/__init__.py b/tests/components/nzbget/__init__.py index 27dc47a6df4..9993bdaff1e 100644 --- a/tests/components/nzbget/__init__.py +++ b/tests/components/nzbget/__init__.py @@ -1,5 +1,6 @@ """Tests for the NZBGet integration.""" from datetime import timedelta +from unittest.mock import patch from homeassistant.components.nzbget.const import DOMAIN from homeassistant.const import ( @@ -13,7 +14,6 @@ from homeassistant.const import ( CONF_VERIFY_SSL, ) -from tests.async_mock import patch from tests.common import MockConfigEntry ENTRY_CONFIG = { diff --git a/tests/components/nzbget/conftest.py b/tests/components/nzbget/conftest.py index 5855253b1d1..c9138cf59d3 100644 --- a/tests/components/nzbget/conftest.py +++ b/tests/components/nzbget/conftest.py @@ -1,10 +1,10 @@ """Define fixtures available for all tests.""" +from unittest.mock import MagicMock, patch + from pytest import fixture from . import MOCK_HISTORY, MOCK_STATUS, MOCK_VERSION -from tests.async_mock import MagicMock, patch - @fixture def nzbget_api(hass): diff --git a/tests/components/nzbget/test_config_flow.py b/tests/components/nzbget/test_config_flow.py index a58d1faa766..68488c376f6 100644 --- a/tests/components/nzbget/test_config_flow.py +++ b/tests/components/nzbget/test_config_flow.py @@ -1,4 +1,6 @@ """Test the NZBGet config flow.""" +from unittest.mock import patch + from pynzbgetapi import NZBGetAPIException from homeassistant.components.nzbget.const import DOMAIN @@ -21,7 +23,6 @@ from . import ( _patch_version, ) -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/nzbget/test_init.py b/tests/components/nzbget/test_init.py index d24a33d1f5b..2dcdab5754e 100644 --- a/tests/components/nzbget/test_init.py +++ b/tests/components/nzbget/test_init.py @@ -1,4 +1,6 @@ """Test the NZBGet config flow.""" +from unittest.mock import patch + from pynzbgetapi import NZBGetAPIException from homeassistant.components.nzbget.const import DOMAIN @@ -20,7 +22,6 @@ from . import ( init_integration, ) -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/nzbget/test_sensor.py b/tests/components/nzbget/test_sensor.py index c9f1ea71f0c..f5954bc7ee0 100644 --- a/tests/components/nzbget/test_sensor.py +++ b/tests/components/nzbget/test_sensor.py @@ -1,5 +1,6 @@ """Test the NZBGet sensors.""" from datetime import timedelta +from unittest.mock import patch from homeassistant.const import ( ATTR_UNIT_OF_MEASUREMENT, @@ -11,8 +12,6 @@ from homeassistant.util import dt as dt_util from . import init_integration -from tests.async_mock import patch - async def test_sensors(hass, nzbget_api) -> None: """Test the creation and values of the sensors.""" diff --git a/tests/components/omnilogic/test_config_flow.py b/tests/components/omnilogic/test_config_flow.py index 6243fe10efb..acf2df88610 100644 --- a/tests/components/omnilogic/test_config_flow.py +++ b/tests/components/omnilogic/test_config_flow.py @@ -1,10 +1,11 @@ """Test the Omnilogic config flow.""" +from unittest.mock import patch + from omnilogic import LoginException, OmniLogicException from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.omnilogic.const import DOMAIN -from tests.async_mock import patch from tests.common import MockConfigEntry DATA = {"username": "test-username", "password": "test-password"} diff --git a/tests/components/onboarding/test_views.py b/tests/components/onboarding/test_views.py index 73845aba7b2..4fa6b8da78a 100644 --- a/tests/components/onboarding/test_views.py +++ b/tests/components/onboarding/test_views.py @@ -1,6 +1,7 @@ """Test the onboarding views.""" import asyncio import os +from unittest.mock import patch import pytest @@ -11,7 +12,6 @@ from homeassistant.setup import async_setup_component from . import mock_storage -from tests.async_mock import patch from tests.common import CLIENT_ID, CLIENT_REDIRECT_URI, register_auth_provider from tests.components.met.conftest import mock_weather # noqa: F401 diff --git a/tests/components/onewire/__init__.py b/tests/components/onewire/__init__.py index 39a3c438cf9..716e73747f1 100644 --- a/tests/components/onewire/__init__.py +++ b/tests/components/onewire/__init__.py @@ -1,5 +1,7 @@ """Tests for 1-Wire integration.""" +from unittest.mock import patch + from homeassistant.components.onewire.const import ( CONF_MOUNT_DIR, CONF_NAMES, @@ -11,7 +13,6 @@ from homeassistant.components.onewire.const import ( from homeassistant.config_entries import CONN_CLASS_LOCAL_POLL from homeassistant.const import CONF_HOST, CONF_PORT, CONF_TYPE -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/onewire/test_binary_sensor.py b/tests/components/onewire/test_binary_sensor.py index be740b13fb5..aee1641c24f 100644 --- a/tests/components/onewire/test_binary_sensor.py +++ b/tests/components/onewire/test_binary_sensor.py @@ -1,5 +1,6 @@ """Tests for 1-Wire devices connected on OWServer.""" import copy +from unittest.mock import patch from pyownet.protocol import Error as ProtocolError import pytest @@ -11,7 +12,6 @@ from homeassistant.setup import async_setup_component from . import setup_onewire_patched_owserver_integration -from tests.async_mock import patch from tests.common import mock_registry MOCK_DEVICE_SENSORS = { diff --git a/tests/components/onewire/test_config_flow.py b/tests/components/onewire/test_config_flow.py index ba0ae090ed2..ea0b5e85dda 100644 --- a/tests/components/onewire/test_config_flow.py +++ b/tests/components/onewire/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for 1-Wire config flow.""" +from unittest.mock import patch + from pyownet import protocol from homeassistant.components.onewire.const import ( @@ -19,8 +21,6 @@ from homeassistant.data_entry_flow import ( from . import setup_onewire_owserver_integration, setup_onewire_sysbus_integration -from tests.async_mock import patch - async def test_user_owserver(hass): """Test OWServer user flow.""" diff --git a/tests/components/onewire/test_entity_owserver.py b/tests/components/onewire/test_entity_owserver.py index aee84f9fe2b..76ab50419d2 100644 --- a/tests/components/onewire/test_entity_owserver.py +++ b/tests/components/onewire/test_entity_owserver.py @@ -1,4 +1,6 @@ """Tests for 1-Wire devices connected on OWServer.""" +from unittest.mock import patch + from pyownet.protocol import Error as ProtocolError import pytest @@ -30,7 +32,6 @@ from homeassistant.setup import async_setup_component from . import setup_onewire_patched_owserver_integration -from tests.async_mock import patch from tests.common import mock_device_registry, mock_registry MOCK_DEVICE_SENSORS = { diff --git a/tests/components/onewire/test_entity_sysbus.py b/tests/components/onewire/test_entity_sysbus.py index 3ec46c60837..437fb1bb7d6 100644 --- a/tests/components/onewire/test_entity_sysbus.py +++ b/tests/components/onewire/test_entity_sysbus.py @@ -1,4 +1,6 @@ """Tests for 1-Wire devices connected on SysBus.""" +from unittest.mock import patch + from pi1wire import InvalidCRCException, UnsupportResponseException import pytest @@ -7,7 +9,6 @@ from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN from homeassistant.const import DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import mock_device_registry, mock_registry MOCK_CONFIG = { diff --git a/tests/components/onewire/test_init.py b/tests/components/onewire/test_init.py index 8edb5fa0178..38e97206698 100644 --- a/tests/components/onewire/test_init.py +++ b/tests/components/onewire/test_init.py @@ -1,4 +1,6 @@ """Tests for 1-Wire config flow.""" +from unittest.mock import patch + from pyownet.protocol import ConnError, OwnetError from homeassistant.components.onewire.const import CONF_TYPE_OWSERVER, DOMAIN @@ -12,7 +14,6 @@ from homeassistant.const import CONF_HOST, CONF_PORT, CONF_TYPE from . import setup_onewire_owserver_integration, setup_onewire_sysbus_integration -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/onewire/test_sensor.py b/tests/components/onewire/test_sensor.py index ad9580f34ed..9e91da01b21 100644 --- a/tests/components/onewire/test_sensor.py +++ b/tests/components/onewire/test_sensor.py @@ -1,4 +1,6 @@ """Tests for 1-Wire sensor platform.""" +from unittest.mock import patch + from pyownet.protocol import Error as ProtocolError import pytest @@ -8,7 +10,6 @@ from homeassistant.setup import async_setup_component from . import setup_onewire_patched_owserver_integration -from tests.async_mock import patch from tests.common import assert_setup_component, mock_registry MOCK_COUPLERS = { diff --git a/tests/components/onewire/test_switch.py b/tests/components/onewire/test_switch.py index 0c70ad3c9fc..1c778d4e264 100644 --- a/tests/components/onewire/test_switch.py +++ b/tests/components/onewire/test_switch.py @@ -1,5 +1,6 @@ """Tests for 1-Wire devices connected on OWServer.""" import copy +from unittest.mock import patch from pyownet.protocol import Error as ProtocolError import pytest @@ -11,7 +12,6 @@ from homeassistant.setup import async_setup_component from . import setup_onewire_patched_owserver_integration -from tests.async_mock import patch from tests.common import mock_registry MOCK_DEVICE_SENSORS = { diff --git a/tests/components/onvif/test_config_flow.py b/tests/components/onvif/test_config_flow.py index b8be96a123c..1802d211348 100644 --- a/tests/components/onvif/test_config_flow.py +++ b/tests/components/onvif/test_config_flow.py @@ -1,11 +1,12 @@ """Test ONVIF config flow.""" +from unittest.mock import AsyncMock, MagicMock, patch + from onvif.exceptions import ONVIFError from zeep.exceptions import Fault from homeassistant import config_entries, data_entry_flow from homeassistant.components.onvif import config_flow -from tests.async_mock import AsyncMock, MagicMock, patch from tests.common import MockConfigEntry URN = "urn:uuid:123456789" diff --git a/tests/components/openalpr_cloud/test_image_processing.py b/tests/components/openalpr_cloud/test_image_processing.py index 7f285d150b7..e1e9192e1de 100644 --- a/tests/components/openalpr_cloud/test_image_processing.py +++ b/tests/components/openalpr_cloud/test_image_processing.py @@ -1,12 +1,12 @@ """The tests for the openalpr cloud platform.""" import asyncio +from unittest.mock import PropertyMock, patch from homeassistant.components import camera, image_processing as ip from homeassistant.components.openalpr_cloud.image_processing import OPENALPR_API_URL from homeassistant.core import callback from homeassistant.setup import setup_component -from tests.async_mock import PropertyMock, patch from tests.common import assert_setup_component, get_test_home_assistant, load_fixture from tests.components.image_processing import common diff --git a/tests/components/openalpr_local/test_image_processing.py b/tests/components/openalpr_local/test_image_processing.py index d98c27490e8..0cde6e0454b 100644 --- a/tests/components/openalpr_local/test_image_processing.py +++ b/tests/components/openalpr_local/test_image_processing.py @@ -1,10 +1,11 @@ """The tests for the openalpr local platform.""" +from unittest.mock import MagicMock, PropertyMock, patch + import homeassistant.components.image_processing as ip from homeassistant.const import ATTR_ENTITY_PICTURE from homeassistant.core import callback from homeassistant.setup import setup_component -from tests.async_mock import MagicMock, PropertyMock, patch from tests.common import assert_setup_component, get_test_home_assistant, load_fixture from tests.components.image_processing import common diff --git a/tests/components/openerz/test_sensor.py b/tests/components/openerz/test_sensor.py index e616ea4fe4e..24a0f0610af 100644 --- a/tests/components/openerz/test_sensor.py +++ b/tests/components/openerz/test_sensor.py @@ -1,9 +1,9 @@ """Tests for OpenERZ component.""" +from unittest.mock import MagicMock, patch + from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, patch - MOCK_CONFIG = { "sensor": { "platform": "openerz", diff --git a/tests/components/opentherm_gw/test_config_flow.py b/tests/components/opentherm_gw/test_config_flow.py index e0f4c6eda99..4d811b9f985 100644 --- a/tests/components/opentherm_gw/test_config_flow.py +++ b/tests/components/opentherm_gw/test_config_flow.py @@ -1,5 +1,6 @@ """Test the Opentherm Gateway config flow.""" import asyncio +from unittest.mock import patch from pyotgw.vars import OTGW, OTGW_ABOUT from serial import SerialException @@ -12,7 +13,6 @@ from homeassistant.components.opentherm_gw.const import ( ) from homeassistant.const import CONF_DEVICE, CONF_ID, CONF_NAME, PRECISION_HALVES -from tests.async_mock import patch from tests.common import MockConfigEntry MINIMAL_STATUS = {OTGW: {OTGW_ABOUT: "OpenTherm Gateway 4.2.5"}} diff --git a/tests/components/openuv/test_config_flow.py b/tests/components/openuv/test_config_flow.py index 9c07322acca..83626c2d9f6 100644 --- a/tests/components/openuv/test_config_flow.py +++ b/tests/components/openuv/test_config_flow.py @@ -1,4 +1,6 @@ """Define tests for the OpenUV config flow.""" +from unittest.mock import patch + from pyopenuv.errors import InvalidApiKeyError import pytest @@ -12,7 +14,6 @@ from homeassistant.const import ( CONF_LONGITUDE, ) -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/openweathermap/test_config_flow.py b/tests/components/openweathermap/test_config_flow.py index c4d6be156bf..daa38bc1dc7 100644 --- a/tests/components/openweathermap/test_config_flow.py +++ b/tests/components/openweathermap/test_config_flow.py @@ -1,4 +1,6 @@ """Define tests for the OpenWeatherMap config flow.""" +from unittest.mock import MagicMock, patch + from pyowm.commons.exceptions import APIRequestError, UnauthorizedError from homeassistant import data_entry_flow @@ -17,7 +19,6 @@ from homeassistant.const import ( CONF_NAME, ) -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry CONFIG = { diff --git a/tests/components/ovo_energy/test_config_flow.py b/tests/components/ovo_energy/test_config_flow.py index a7f6ea9b9f2..ccf485211aa 100644 --- a/tests/components/ovo_energy/test_config_flow.py +++ b/tests/components/ovo_energy/test_config_flow.py @@ -1,4 +1,6 @@ """Test the OVO Energy config flow.""" +from unittest.mock import patch + import aiohttp from homeassistant import config_entries, data_entry_flow @@ -6,7 +8,6 @@ from homeassistant.components.ovo_energy.const import DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_USERNAME from homeassistant.core import HomeAssistant -from tests.async_mock import patch from tests.common import MockConfigEntry FIXTURE_REAUTH_INPUT = {CONF_PASSWORD: "something1"} diff --git a/tests/components/owntracks/test_config_flow.py b/tests/components/owntracks/test_config_flow.py index 2290e3e17a4..d6ac059ce26 100644 --- a/tests/components/owntracks/test_config_flow.py +++ b/tests/components/owntracks/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for OwnTracks config flow.""" +from unittest.mock import patch + import pytest from homeassistant import data_entry_flow @@ -9,7 +11,6 @@ from homeassistant.config import async_process_ha_core_config from homeassistant.const import CONF_WEBHOOK_ID from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import MockConfigEntry CONF_WEBHOOK_URL = "webhook_url" diff --git a/tests/components/owntracks/test_device_tracker.py b/tests/components/owntracks/test_device_tracker.py index 9f3694637f3..c21361c5fff 100644 --- a/tests/components/owntracks/test_device_tracker.py +++ b/tests/components/owntracks/test_device_tracker.py @@ -1,5 +1,6 @@ """The tests for the Owntracks device tracker.""" import json +from unittest.mock import patch import pytest @@ -7,7 +8,6 @@ from homeassistant.components import owntracks from homeassistant.const import STATE_NOT_HOME from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import MockConfigEntry, async_fire_mqtt_message, mock_coro USER = "greg" diff --git a/tests/components/owntracks/test_helper.py b/tests/components/owntracks/test_helper.py index 6d5139caa14..2c06ac0c4e7 100644 --- a/tests/components/owntracks/test_helper.py +++ b/tests/components/owntracks/test_helper.py @@ -1,10 +1,10 @@ """Test the owntracks_http platform.""" +from unittest.mock import patch + import pytest from homeassistant.components.owntracks import helper -from tests.async_mock import patch - @pytest.fixture(name="nacl_imported") def mock_nacl_imported(): diff --git a/tests/components/ozw/common.py b/tests/components/ozw/common.py index 7a78d11a445..6b44d364413 100644 --- a/tests/components/ozw/common.py +++ b/tests/components/ozw/common.py @@ -1,10 +1,10 @@ """Helpers for tests.""" import json +from unittest.mock import Mock, patch from homeassistant import config_entries from homeassistant.components.ozw.const import DOMAIN -from tests.async_mock import Mock, patch from tests.common import MockConfigEntry diff --git a/tests/components/ozw/conftest.py b/tests/components/ozw/conftest.py index d3f8288658c..b2bd6486d0f 100644 --- a/tests/components/ozw/conftest.py +++ b/tests/components/ozw/conftest.py @@ -1,11 +1,11 @@ """Helpers for tests.""" import json +from unittest.mock import patch import pytest from .common import MQTTMessage -from tests.async_mock import patch from tests.common import load_fixture from tests.components.light.conftest import mock_light_profiles # noqa diff --git a/tests/components/ozw/test_config_flow.py b/tests/components/ozw/test_config_flow.py index e86232adc65..c7ff2512ca7 100644 --- a/tests/components/ozw/test_config_flow.py +++ b/tests/components/ozw/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Z-Wave over MQTT config flow.""" +from unittest.mock import patch + import pytest from homeassistant import config_entries, setup @@ -6,7 +8,6 @@ from homeassistant.components.hassio.handler import HassioAPIError from homeassistant.components.ozw.config_flow import TITLE from homeassistant.components.ozw.const import DOMAIN -from tests.async_mock import patch from tests.common import MockConfigEntry ADDON_DISCOVERY_INFO = { diff --git a/tests/components/ozw/test_init.py b/tests/components/ozw/test_init.py index efc38fa63c2..ac7ad59f3cb 100644 --- a/tests/components/ozw/test_init.py +++ b/tests/components/ozw/test_init.py @@ -1,11 +1,12 @@ """Test integration initialization.""" +from unittest.mock import patch + from homeassistant import config_entries from homeassistant.components.hassio.handler import HassioAPIError from homeassistant.components.ozw import DOMAIN, PLATFORMS, const from .common import setup_ozw -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/ozw/test_websocket_api.py b/tests/components/ozw/test_websocket_api.py index 37c6d184c8e..383d3425ffb 100644 --- a/tests/components/ozw/test_websocket_api.py +++ b/tests/components/ozw/test_websocket_api.py @@ -1,4 +1,6 @@ """Test OpenZWave Websocket API.""" +from unittest.mock import patch + from openzwavemqtt.const import ( ATTR_CODE_SLOT, ATTR_LABEL, @@ -40,8 +42,6 @@ from homeassistant.components.websocket_api.const import ( from .common import MQTTMessage, setup_ozw -from tests.async_mock import patch - async def test_websocket_api(hass, generic_data, hass_ws_client): """Test the ozw websocket api.""" diff --git a/tests/components/panasonic_viera/test_config_flow.py b/tests/components/panasonic_viera/test_config_flow.py index 15e6b73202d..e099862604a 100644 --- a/tests/components/panasonic_viera/test_config_flow.py +++ b/tests/components/panasonic_viera/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Panasonic Viera config flow.""" +from unittest.mock import Mock, patch + from panasonic_viera import TV_TYPE_ENCRYPTED, TV_TYPE_NONENCRYPTED, SOAPError import pytest @@ -21,7 +23,6 @@ from homeassistant.components.panasonic_viera.const import ( ) from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PIN, CONF_PORT -from tests.async_mock import Mock, patch from tests.common import MockConfigEntry diff --git a/tests/components/panasonic_viera/test_init.py b/tests/components/panasonic_viera/test_init.py index 3ac6b7e12da..8f95043f4fa 100644 --- a/tests/components/panasonic_viera/test_init.py +++ b/tests/components/panasonic_viera/test_init.py @@ -1,4 +1,6 @@ """Test the Panasonic Viera setup process.""" +from unittest.mock import Mock, patch + from homeassistant.components.panasonic_viera.const import ( ATTR_DEVICE_INFO, ATTR_FRIENDLY_NAME, @@ -18,7 +20,6 @@ from homeassistant.config_entries import ENTRY_STATE_NOT_LOADED from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, patch from tests.common import MockConfigEntry MOCK_CONFIG_DATA = { diff --git a/tests/components/panel_custom/test_init.py b/tests/components/panel_custom/test_init.py index ddcb4079ef7..bf67ca23e11 100644 --- a/tests/components/panel_custom/test_init.py +++ b/tests/components/panel_custom/test_init.py @@ -1,9 +1,9 @@ """The tests for the panel_custom component.""" +from unittest.mock import Mock, patch + from homeassistant import setup from homeassistant.components import frontend -from tests.async_mock import Mock, patch - async def test_webcomponent_custom_path_not_found(hass): """Test if a web component is found in config panels dir.""" diff --git a/tests/components/person/test_init.py b/tests/components/person/test_init.py index 64aa583e2f5..86ec71c1452 100644 --- a/tests/components/person/test_init.py +++ b/tests/components/person/test_init.py @@ -1,5 +1,6 @@ """The tests for the person component.""" import logging +from unittest.mock import patch import pytest @@ -24,7 +25,6 @@ from homeassistant.core import Context, CoreState, State from homeassistant.helpers import collection, entity_registry from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import mock_component, mock_restore_cache DEVICE_TRACKER = "device_tracker.test_tracker" diff --git a/tests/components/pi_hole/__init__.py b/tests/components/pi_hole/__init__.py index f487f413363..f2a040f615a 100644 --- a/tests/components/pi_hole/__init__.py +++ b/tests/components/pi_hole/__init__.py @@ -1,4 +1,6 @@ """Tests for the pi_hole component.""" +from unittest.mock import AsyncMock, MagicMock, patch + from hole.exceptions import HoleError from homeassistant.components.pi_hole.const import CONF_LOCATION @@ -11,8 +13,6 @@ from homeassistant.const import ( CONF_VERIFY_SSL, ) -from tests.async_mock import AsyncMock, MagicMock, patch - ZERO_DATA = { "ads_blocked_today": 0, "ads_percentage_today": 0, diff --git a/tests/components/pi_hole/test_config_flow.py b/tests/components/pi_hole/test_config_flow.py index 714f211d4f8..28589ab0193 100644 --- a/tests/components/pi_hole/test_config_flow.py +++ b/tests/components/pi_hole/test_config_flow.py @@ -1,5 +1,6 @@ """Test pi_hole config flow.""" import logging +from unittest.mock import patch from homeassistant.components.pi_hole.const import DOMAIN from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER @@ -17,8 +18,6 @@ from . import ( _patch_config_flow_hole, ) -from tests.async_mock import patch - def _flow_next(hass, flow_id): return next( diff --git a/tests/components/pi_hole/test_init.py b/tests/components/pi_hole/test_init.py index 1f3e2451895..ef462270954 100644 --- a/tests/components/pi_hole/test_init.py +++ b/tests/components/pi_hole/test_init.py @@ -1,5 +1,6 @@ """Test pi_hole component.""" import logging +from unittest.mock import AsyncMock from hole.exceptions import HoleError @@ -29,7 +30,6 @@ from . import ( _patch_init_hole, ) -from tests.async_mock import AsyncMock from tests.common import MockConfigEntry diff --git a/tests/components/pilight/test_init.py b/tests/components/pilight/test_init.py index 25ccb3dcf36..b69e03058bf 100644 --- a/tests/components/pilight/test_init.py +++ b/tests/components/pilight/test_init.py @@ -2,6 +2,7 @@ from datetime import timedelta import logging import socket +from unittest.mock import patch from voluptuous import MultipleInvalid @@ -9,7 +10,6 @@ from homeassistant.components import pilight from homeassistant.setup import async_setup_component from homeassistant.util import dt as dt_util -from tests.async_mock import patch from tests.common import assert_setup_component, async_fire_time_changed _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/ping/test_binary_sensor.py b/tests/components/ping/test_binary_sensor.py index ae6362939a7..a9af91c9f6f 100644 --- a/tests/components/ping/test_binary_sensor.py +++ b/tests/components/ping/test_binary_sensor.py @@ -1,12 +1,11 @@ """The test for the ping binary_sensor platform.""" from os import path +from unittest.mock import patch from homeassistant import config as hass_config, setup from homeassistant.components.ping import DOMAIN from homeassistant.const import SERVICE_RELOAD -from tests.async_mock import patch - async def test_reload(hass): """Verify we can reload trend sensors.""" diff --git a/tests/components/plex/conftest.py b/tests/components/plex/conftest.py index 1838df32a05..50fcf3eb64d 100644 --- a/tests/components/plex/conftest.py +++ b/tests/components/plex/conftest.py @@ -1,4 +1,6 @@ """Fixtures for Plex tests.""" +from unittest.mock import patch + import pytest from homeassistant.components.plex.const import DOMAIN @@ -7,7 +9,6 @@ from .const import DEFAULT_DATA, DEFAULT_OPTIONS from .helpers import websocket_connected from .mock_classes import MockGDM, MockPlexAccount, MockPlexServer -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/plex/test_config_flow.py b/tests/components/plex/test_config_flow.py index d8c010ceb92..13754a725db 100644 --- a/tests/components/plex/test_config_flow.py +++ b/tests/components/plex/test_config_flow.py @@ -1,6 +1,7 @@ """Tests for Plex config flow.""" import copy import ssl +from unittest.mock import patch import plexapi.exceptions import requests.exceptions @@ -45,7 +46,6 @@ from .mock_classes import ( MockResource, ) -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/plex/test_init.py b/tests/components/plex/test_init.py index a1a159010ef..404f7c167a5 100644 --- a/tests/components/plex/test_init.py +++ b/tests/components/plex/test_init.py @@ -2,6 +2,7 @@ import copy from datetime import timedelta import ssl +from unittest.mock import patch import plexapi import requests @@ -20,7 +21,6 @@ from .const import DEFAULT_DATA, DEFAULT_OPTIONS from .helpers import trigger_plex_update, wait_for_debouncer from .mock_classes import MockGDM, MockPlexAccount, MockPlexServer -from tests.async_mock import patch from tests.common import MockConfigEntry, async_fire_time_changed diff --git a/tests/components/plex/test_media_players.py b/tests/components/plex/test_media_players.py index a4bda5467e2..3586cbc87bb 100644 --- a/tests/components/plex/test_media_players.py +++ b/tests/components/plex/test_media_players.py @@ -1,10 +1,10 @@ """Tests for Plex media_players.""" +from unittest.mock import patch + from plexapi.exceptions import NotFound from homeassistant.components.plex.const import DOMAIN, SERVERS -from tests.async_mock import patch - async def test_plex_tv_clients(hass, entry, mock_plex_account, setup_plex_server): """Test getting Plex clients from plex.tv.""" diff --git a/tests/components/plex/test_playback.py b/tests/components/plex/test_playback.py index 5119286d3b8..89c3f0253be 100644 --- a/tests/components/plex/test_playback.py +++ b/tests/components/plex/test_playback.py @@ -1,4 +1,6 @@ """Tests for Plex player playback methods/services.""" +from unittest.mock import patch + from plexapi.exceptions import NotFound from homeassistant.components.media_player.const import ( @@ -17,7 +19,6 @@ from homeassistant.exceptions import HomeAssistantError from .const import DEFAULT_OPTIONS, SECONDARY_DATA -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/plex/test_server.py b/tests/components/plex/test_server.py index 99a324786f6..2f8619834df 100644 --- a/tests/components/plex/test_server.py +++ b/tests/components/plex/test_server.py @@ -1,5 +1,6 @@ """Tests for Plex server.""" import copy +from unittest.mock import patch from plexapi.exceptions import BadRequest, NotFound from requests.exceptions import ConnectionError, RequestException @@ -39,8 +40,6 @@ from .mock_classes import ( MockPlexShow, ) -from tests.async_mock import patch - async def test_new_users_available(hass, entry, mock_websocket, setup_plex_server): """Test setting up when new users available on Plex server.""" diff --git a/tests/components/plex/test_services.py b/tests/components/plex/test_services.py index a3f4d4c833a..06654a736c7 100644 --- a/tests/components/plex/test_services.py +++ b/tests/components/plex/test_services.py @@ -1,4 +1,6 @@ """Tests for various Plex services.""" +from unittest.mock import patch + from homeassistant.components.plex.const import ( CONF_SERVER, CONF_SERVER_IDENTIFIER, @@ -18,7 +20,6 @@ from homeassistant.const import ( from .const import MOCK_SERVERS, MOCK_TOKEN from .mock_classes import MockPlexLibrarySection -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/plugwise/conftest.py b/tests/components/plugwise/conftest.py index ae934c565bc..615cfc55eeb 100644 --- a/tests/components/plugwise/conftest.py +++ b/tests/components/plugwise/conftest.py @@ -2,6 +2,7 @@ from functools import partial import re +from unittest.mock import AsyncMock, Mock, patch import jsonpickle from plugwise.exceptions import ( @@ -12,7 +13,6 @@ from plugwise.exceptions import ( ) import pytest -from tests.async_mock import AsyncMock, Mock, patch from tests.common import load_fixture from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/plugwise/test_config_flow.py b/tests/components/plugwise/test_config_flow.py index fc0e5f9e69f..382e7bc1a52 100644 --- a/tests/components/plugwise/test_config_flow.py +++ b/tests/components/plugwise/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Plugwise config flow.""" +from unittest.mock import MagicMock, patch + from plugwise.exceptions import ( ConnectionFailedError, InvalidAuthentication, @@ -22,7 +24,6 @@ from homeassistant.const import ( CONF_USERNAME, ) -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry TEST_HOST = "1.1.1.1" diff --git a/tests/components/plum_lightpad/test_config_flow.py b/tests/components/plum_lightpad/test_config_flow.py index f2ac756c4a3..29539b5886f 100644 --- a/tests/components/plum_lightpad/test_config_flow.py +++ b/tests/components/plum_lightpad/test_config_flow.py @@ -1,10 +1,11 @@ """Test the Plum Lightpad config flow.""" +from unittest.mock import patch + from requests.exceptions import ConnectTimeout from homeassistant import config_entries, setup from homeassistant.components.plum_lightpad.const import DOMAIN -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/plum_lightpad/test_init.py b/tests/components/plum_lightpad/test_init.py index 139ab786d1d..f4452dce880 100644 --- a/tests/components/plum_lightpad/test_init.py +++ b/tests/components/plum_lightpad/test_init.py @@ -1,4 +1,6 @@ """Tests for the Plum Lightpad config flow.""" +from unittest.mock import Mock, patch + from aiohttp import ContentTypeError from requests.exceptions import HTTPError @@ -6,7 +8,6 @@ from homeassistant.components.plum_lightpad.const import DOMAIN from homeassistant.core import HomeAssistant from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, patch from tests.common import MockConfigEntry diff --git a/tests/components/point/test_config_flow.py b/tests/components/point/test_config_flow.py index 67817b308ce..93ea18f21b6 100644 --- a/tests/components/point/test_config_flow.py +++ b/tests/components/point/test_config_flow.py @@ -1,5 +1,6 @@ """Tests for the Point config flow.""" import asyncio +from unittest.mock import AsyncMock, patch import pytest @@ -7,8 +8,6 @@ from homeassistant import data_entry_flow from homeassistant.components.point import DOMAIN, config_flow from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET -from tests.async_mock import AsyncMock, patch - def init_config_flow(hass, side_effect=None): """Init a configuration flow.""" diff --git a/tests/components/poolsense/test_config_flow.py b/tests/components/poolsense/test_config_flow.py index 8ea05339c84..ca32a21758e 100644 --- a/tests/components/poolsense/test_config_flow.py +++ b/tests/components/poolsense/test_config_flow.py @@ -1,11 +1,11 @@ """Test the PoolSense config flow.""" +from unittest.mock import patch + from homeassistant import data_entry_flow from homeassistant.components.poolsense.const import DOMAIN from homeassistant.config_entries import SOURCE_USER from homeassistant.const import CONF_EMAIL, CONF_PASSWORD -from tests.async_mock import patch - async def test_show_form(hass): """Test that the form is served with no input.""" diff --git a/tests/components/powerwall/mocks.py b/tests/components/powerwall/mocks.py index 6beb31c293a..8de8f5bfa4b 100644 --- a/tests/components/powerwall/mocks.py +++ b/tests/components/powerwall/mocks.py @@ -2,6 +2,7 @@ import json import os +from unittest.mock import MagicMock, Mock from tesla_powerwall import ( DeviceType, @@ -16,7 +17,6 @@ from tesla_powerwall import ( from homeassistant.components.powerwall.const import DOMAIN from homeassistant.const import CONF_IP_ADDRESS -from tests.async_mock import MagicMock, Mock from tests.common import load_fixture diff --git a/tests/components/powerwall/test_binary_sensor.py b/tests/components/powerwall/test_binary_sensor.py index caf7519f598..ae56addfbf8 100644 --- a/tests/components/powerwall/test_binary_sensor.py +++ b/tests/components/powerwall/test_binary_sensor.py @@ -1,13 +1,13 @@ """The binary sensor tests for the powerwall platform.""" +from unittest.mock import patch + from homeassistant.components.powerwall.const import DOMAIN from homeassistant.const import STATE_ON from homeassistant.setup import async_setup_component from .mocks import _mock_get_config, _mock_powerwall_with_fixtures -from tests.async_mock import patch - async def test_sensors(hass): """Test creation of the binary sensors.""" diff --git a/tests/components/powerwall/test_config_flow.py b/tests/components/powerwall/test_config_flow.py index 4f1a587b31b..c7aa4782ea3 100644 --- a/tests/components/powerwall/test_config_flow.py +++ b/tests/components/powerwall/test_config_flow.py @@ -1,5 +1,7 @@ """Test the Powerwall config flow.""" +from unittest.mock import patch + from tesla_powerwall import MissingAttributeError, PowerwallUnreachableError from homeassistant import config_entries, setup @@ -8,8 +10,6 @@ from homeassistant.const import CONF_IP_ADDRESS from .mocks import _mock_powerwall_side_effect, _mock_powerwall_site_name -from tests.async_mock import patch - async def test_form_source_user(hass): """Test we get config flow setup form as a user.""" diff --git a/tests/components/powerwall/test_sensor.py b/tests/components/powerwall/test_sensor.py index 0be7c12c5a8..104ed0cbbf3 100644 --- a/tests/components/powerwall/test_sensor.py +++ b/tests/components/powerwall/test_sensor.py @@ -1,13 +1,13 @@ """The sensor tests for the powerwall platform.""" +from unittest.mock import patch + from homeassistant.components.powerwall.const import DOMAIN from homeassistant.const import PERCENTAGE from homeassistant.setup import async_setup_component from .mocks import _mock_get_config, _mock_powerwall_with_fixtures -from tests.async_mock import patch - async def test_sensors(hass): """Test creation of the sensors.""" diff --git a/tests/components/profiler/test_config_flow.py b/tests/components/profiler/test_config_flow.py index dc2ddff14d9..d3b2b473012 100644 --- a/tests/components/profiler/test_config_flow.py +++ b/tests/components/profiler/test_config_flow.py @@ -1,8 +1,9 @@ """Test the Profiler config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, setup from homeassistant.components.profiler.const import DOMAIN -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/profiler/test_init.py b/tests/components/profiler/test_init.py index 0ccda904eb6..efed6ef6126 100644 --- a/tests/components/profiler/test_init.py +++ b/tests/components/profiler/test_init.py @@ -1,6 +1,7 @@ """Test the Profiler config flow.""" from datetime import timedelta import os +from unittest.mock import patch from homeassistant import setup from homeassistant.components.profiler import ( @@ -16,7 +17,6 @@ from homeassistant.components.profiler import ( from homeassistant.components.profiler.const import DOMAIN import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import MockConfigEntry, async_fire_time_changed diff --git a/tests/components/progettihwsw/test_config_flow.py b/tests/components/progettihwsw/test_config_flow.py index 7a0dbd692c0..883c1acd33b 100644 --- a/tests/components/progettihwsw/test_config_flow.py +++ b/tests/components/progettihwsw/test_config_flow.py @@ -1,4 +1,6 @@ """Test the ProgettiHWSW Automation config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, setup from homeassistant.components.progettihwsw.const import DOMAIN from homeassistant.const import CONF_HOST, CONF_PORT @@ -8,7 +10,6 @@ from homeassistant.data_entry_flow import ( RESULT_TYPE_FORM, ) -from tests.async_mock import patch from tests.common import MockConfigEntry mock_value_step_user = { diff --git a/tests/components/prometheus/test_init.py b/tests/components/prometheus/test_init.py index f187429b151..bea42cc0888 100644 --- a/tests/components/prometheus/test_init.py +++ b/tests/components/prometheus/test_init.py @@ -1,6 +1,7 @@ """The tests for the Prometheus exporter.""" from dataclasses import dataclass import datetime +import unittest.mock as mock import pytest @@ -19,8 +20,6 @@ from homeassistant.core import split_entity_id from homeassistant.setup import async_setup_component from homeassistant.util import dt as dt_util -import tests.async_mock as mock - PROMETHEUS_PATH = "homeassistant.components.prometheus" diff --git a/tests/components/ps4/conftest.py b/tests/components/ps4/conftest.py index 42002404db2..821c58d596d 100644 --- a/tests/components/ps4/conftest.py +++ b/tests/components/ps4/conftest.py @@ -1,7 +1,7 @@ """Test configuration for PS4.""" -import pytest +from unittest.mock import patch -from tests.async_mock import patch +import pytest @pytest.fixture diff --git a/tests/components/ps4/test_config_flow.py b/tests/components/ps4/test_config_flow.py index 8ef11335199..bcae74c19fb 100644 --- a/tests/components/ps4/test_config_flow.py +++ b/tests/components/ps4/test_config_flow.py @@ -1,4 +1,6 @@ """Define tests for the PlayStation 4 config flow.""" +from unittest.mock import patch + from pyps4_2ndscreen.errors import CredentialTimeout import pytest @@ -21,7 +23,6 @@ from homeassistant.const import ( ) from homeassistant.util import location -from tests.async_mock import patch from tests.common import MockConfigEntry MOCK_TITLE = "PlayStation 4" diff --git a/tests/components/ps4/test_init.py b/tests/components/ps4/test_init.py index 75a983cc97a..da241022938 100644 --- a/tests/components/ps4/test_init.py +++ b/tests/components/ps4/test_init.py @@ -1,4 +1,6 @@ """Tests for the PS4 Integration.""" +from unittest.mock import MagicMock, patch + from homeassistant import config_entries, data_entry_flow from homeassistant.components import ps4 from homeassistant.components.media_player.const import ( @@ -27,7 +29,6 @@ from homeassistant.exceptions import HomeAssistantError from homeassistant.setup import async_setup_component from homeassistant.util import location -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry, mock_registry MOCK_HOST = "192.168.0.1" diff --git a/tests/components/ps4/test_media_player.py b/tests/components/ps4/test_media_player.py index 8a03f13beda..48fb27ab6bc 100644 --- a/tests/components/ps4/test_media_player.py +++ b/tests/components/ps4/test_media_player.py @@ -1,4 +1,6 @@ """Tests for the PS4 media player platform.""" +from unittest.mock import MagicMock, patch + from pyps4_2ndscreen.credential import get_ddp_message from pyps4_2ndscreen.ddp import DEFAULT_UDP_PORT from pyps4_2ndscreen.media_art import TYPE_APP as PS_TYPE_APP @@ -36,7 +38,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry, mock_device_registry, mock_registry MOCK_CREDS = "123412341234abcd12341234abcd12341234abcd12341234abcd12341234abcd" diff --git a/tests/components/ptvsd/test_ptvsd.py b/tests/components/ptvsd/test_ptvsd.py index 93e1bb540db..b3e408833dc 100644 --- a/tests/components/ptvsd/test_ptvsd.py +++ b/tests/components/ptvsd/test_ptvsd.py @@ -1,13 +1,13 @@ """Tests for PTVSD Debugger.""" +from unittest.mock import AsyncMock, patch + from pytest import mark from homeassistant.bootstrap import _async_set_up_integrations import homeassistant.components.ptvsd as ptvsd_component from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock, patch - @mark.skip("causes code cover to fail") async def test_ptvsd(hass): diff --git a/tests/components/pushbullet/test_notify.py b/tests/components/pushbullet/test_notify.py index 12bfc686d17..3eec106019c 100644 --- a/tests/components/pushbullet/test_notify.py +++ b/tests/components/pushbullet/test_notify.py @@ -1,5 +1,6 @@ """The tests for the pushbullet notification platform.""" import json +from unittest.mock import patch from pushbullet import PushBullet import pytest @@ -7,7 +8,6 @@ import pytest import homeassistant.components.notify as notify from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import assert_setup_component, load_fixture diff --git a/tests/components/pvpc_hourly_pricing/test_config_flow.py b/tests/components/pvpc_hourly_pricing/test_config_flow.py index 5f72875c26a..ad321181ec4 100644 --- a/tests/components/pvpc_hourly_pricing/test_config_flow.py +++ b/tests/components/pvpc_hourly_pricing/test_config_flow.py @@ -1,5 +1,6 @@ """Tests for the pvpc_hourly_pricing config_flow.""" from datetime import datetime +from unittest.mock import patch from pytz import timezone @@ -10,7 +11,6 @@ from homeassistant.helpers import entity_registry from .conftest import check_valid_state -from tests.async_mock import patch from tests.common import date_util from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/pvpc_hourly_pricing/test_sensor.py b/tests/components/pvpc_hourly_pricing/test_sensor.py index ca3dec1e891..2045ba52671 100644 --- a/tests/components/pvpc_hourly_pricing/test_sensor.py +++ b/tests/components/pvpc_hourly_pricing/test_sensor.py @@ -1,6 +1,7 @@ """Tests for the pvpc_hourly_pricing sensor component.""" from datetime import datetime, timedelta import logging +from unittest.mock import patch from pytz import timezone @@ -11,7 +12,6 @@ from homeassistant.setup import async_setup_component from .conftest import check_valid_state -from tests.async_mock import patch from tests.common import date_util from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/python_script/test_init.py b/tests/components/python_script/test_init.py index bcd846889fa..b58bd6eb469 100644 --- a/tests/components/python_script/test_init.py +++ b/tests/components/python_script/test_init.py @@ -1,11 +1,11 @@ """Test the python_script component.""" import logging +from unittest.mock import mock_open, patch from homeassistant.components.python_script import DOMAIN, FOLDER, execute from homeassistant.helpers.service import async_get_all_descriptions from homeassistant.setup import async_setup_component -from tests.async_mock import mock_open, patch from tests.common import patch_yaml_files diff --git a/tests/components/qld_bushfire/test_geo_location.py b/tests/components/qld_bushfire/test_geo_location.py index 743d967c953..58974c55b45 100644 --- a/tests/components/qld_bushfire/test_geo_location.py +++ b/tests/components/qld_bushfire/test_geo_location.py @@ -1,5 +1,6 @@ """The tests for the Queensland Bushfire Alert Feed platform.""" import datetime +from unittest.mock import MagicMock, call, patch from homeassistant.components import geo_location from homeassistant.components.geo_location import ATTR_SOURCE @@ -27,7 +28,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import MagicMock, call, patch from tests.common import assert_setup_component, async_fire_time_changed CONFIG = {geo_location.DOMAIN: [{"platform": "qld_bushfire", CONF_RADIUS: 200}]} diff --git a/tests/components/qwikswitch/test_init.py b/tests/components/qwikswitch/test_init.py index 7d92d40f987..74e600b50e4 100644 --- a/tests/components/qwikswitch/test_init.py +++ b/tests/components/qwikswitch/test_init.py @@ -1,5 +1,6 @@ """Test qwikswitch sensors.""" import asyncio +from unittest.mock import Mock from aiohttp.client_exceptions import ClientError import pytest @@ -8,7 +9,6 @@ from yarl import URL from homeassistant.components.qwikswitch import DOMAIN as QWIKSWITCH from homeassistant.setup import async_setup_component -from tests.async_mock import Mock from tests.test_util.aiohttp import AiohttpClientMockResponse, MockLongPollSideEffect diff --git a/tests/components/rachio/test_config_flow.py b/tests/components/rachio/test_config_flow.py index 75d671262a1..6b0fc2e69cb 100644 --- a/tests/components/rachio/test_config_flow.py +++ b/tests/components/rachio/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Rachio config flow.""" +from unittest.mock import MagicMock, patch + from homeassistant import config_entries, setup from homeassistant.components.rachio.const import ( CONF_CUSTOM_URL, @@ -7,7 +9,6 @@ from homeassistant.components.rachio.const import ( ) from homeassistant.const import CONF_API_KEY -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry diff --git a/tests/components/radarr/test_sensor.py b/tests/components/radarr/test_sensor.py index aa6a2a02679..514b8f1b817 100644 --- a/tests/components/radarr/test_sensor.py +++ b/tests/components/radarr/test_sensor.py @@ -1,11 +1,11 @@ """The tests for the Radarr platform.""" +from unittest.mock import patch + import pytest from homeassistant.const import DATA_GIGABYTES from homeassistant.setup import async_setup_component -from tests.async_mock import patch - def mocked_exception(*args, **kwargs): """Mock exception thrown by requests.get.""" diff --git a/tests/components/rainmachine/test_config_flow.py b/tests/components/rainmachine/test_config_flow.py index 7fb30d0043d..e79874831fe 100644 --- a/tests/components/rainmachine/test_config_flow.py +++ b/tests/components/rainmachine/test_config_flow.py @@ -1,4 +1,6 @@ """Define tests for the OpenUV config flow.""" +from unittest.mock import patch + from regenmaschine.errors import RainMachineError from homeassistant import data_entry_flow @@ -6,7 +8,6 @@ from homeassistant.components.rainmachine import CONF_ZONE_RUN_TIME, DOMAIN, con from homeassistant.config_entries import SOURCE_USER from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD, CONF_PORT, CONF_SSL -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/random/test_binary_sensor.py b/tests/components/random/test_binary_sensor.py index 85a8e32018c..682c6db58d8 100644 --- a/tests/components/random/test_binary_sensor.py +++ b/tests/components/random/test_binary_sensor.py @@ -1,7 +1,7 @@ """The test for the Random binary sensor platform.""" -from homeassistant.setup import async_setup_component +from unittest.mock import patch -from tests.async_mock import patch +from homeassistant.setup import async_setup_component async def test_random_binary_sensor_on(hass): diff --git a/tests/components/recollect_waste/test_config_flow.py b/tests/components/recollect_waste/test_config_flow.py index ca3fbe8be56..cabcb1a8f9e 100644 --- a/tests/components/recollect_waste/test_config_flow.py +++ b/tests/components/recollect_waste/test_config_flow.py @@ -1,4 +1,6 @@ """Define tests for the ReCollect Waste config flow.""" +from unittest.mock import patch + from aiorecollect.errors import RecollectError from homeassistant import data_entry_flow @@ -10,7 +12,6 @@ from homeassistant.components.recollect_waste import ( from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER from homeassistant.const import CONF_FRIENDLY_NAME -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/recorder/test_init.py b/tests/components/recorder/test_init.py index 41c1f52b993..d4092d709c0 100644 --- a/tests/components/recorder/test_init.py +++ b/tests/components/recorder/test_init.py @@ -1,6 +1,7 @@ """The tests for the Recorder component.""" # pylint: disable=protected-access from datetime import datetime, timedelta +from unittest.mock import patch from sqlalchemy.exc import OperationalError @@ -22,7 +23,6 @@ from homeassistant.util import dt as dt_util from .common import wait_recording_done -from tests.async_mock import patch from tests.common import fire_time_changed, get_test_home_assistant diff --git a/tests/components/recorder/test_migrate.py b/tests/components/recorder/test_migrate.py index d3cf69fc994..d10dad43d75 100644 --- a/tests/components/recorder/test_migrate.py +++ b/tests/components/recorder/test_migrate.py @@ -1,4 +1,7 @@ """The tests for the Recorder component.""" +# pylint: disable=protected-access +from unittest.mock import call, patch + import pytest from sqlalchemy import create_engine from sqlalchemy.pool import StaticPool @@ -6,8 +9,6 @@ from sqlalchemy.pool import StaticPool from homeassistant.bootstrap import async_setup_component from homeassistant.components.recorder import const, migration, models -# pylint: disable=protected-access -from tests.async_mock import call, patch from tests.components.recorder import models_original diff --git a/tests/components/recorder/test_purge.py b/tests/components/recorder/test_purge.py index 9cb07819e79..791bd84b11b 100644 --- a/tests/components/recorder/test_purge.py +++ b/tests/components/recorder/test_purge.py @@ -1,6 +1,7 @@ """Test data purging.""" from datetime import datetime, timedelta import json +from unittest.mock import patch from homeassistant.components import recorder from homeassistant.components.recorder.const import DATA_INSTANCE @@ -11,8 +12,6 @@ from homeassistant.util import dt as dt_util from .common import wait_recording_done -from tests.async_mock import patch - def test_purge_old_states(hass, hass_recorder): """Test deleting old states.""" diff --git a/tests/components/recorder/test_util.py b/tests/components/recorder/test_util.py index 23ab7ff929d..a4109648d2f 100644 --- a/tests/components/recorder/test_util.py +++ b/tests/components/recorder/test_util.py @@ -2,6 +2,7 @@ from datetime import timedelta import os import sqlite3 +from unittest.mock import MagicMock, patch import pytest @@ -11,7 +12,6 @@ from homeassistant.util import dt as dt_util from .common import wait_recording_done -from tests.async_mock import MagicMock, patch from tests.common import get_test_home_assistant, init_recorder_component diff --git a/tests/components/reddit/test_sensor.py b/tests/components/reddit/test_sensor.py index c49abd4038a..21767792afd 100644 --- a/tests/components/reddit/test_sensor.py +++ b/tests/components/reddit/test_sensor.py @@ -1,5 +1,6 @@ """The tests for the Reddit platform.""" import copy +from unittest.mock import patch from homeassistant.components.reddit.sensor import ( ATTR_BODY, @@ -23,8 +24,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import patch - VALID_CONFIG = { "sensor": { "platform": DOMAIN, diff --git a/tests/components/remember_the_milk/test_init.py b/tests/components/remember_the_milk/test_init.py index e03475c9131..2f3511aeaa8 100644 --- a/tests/components/remember_the_milk/test_init.py +++ b/tests/components/remember_the_milk/test_init.py @@ -1,10 +1,10 @@ """Tests for the Remember The Milk component.""" +from unittest.mock import Mock, mock_open, patch + import homeassistant.components.remember_the_milk as rtm from .const import JSON_STRING, PROFILE, TOKEN -from tests.async_mock import Mock, mock_open, patch - def test_create_new(hass): """Test creating a new config file.""" diff --git a/tests/components/remote/test_device_condition.py b/tests/components/remote/test_device_condition.py index e5a9bc3a9c9..c6a2b3f0c52 100644 --- a/tests/components/remote/test_device_condition.py +++ b/tests/components/remote/test_device_condition.py @@ -1,5 +1,6 @@ """The test for remote device automation.""" from datetime import timedelta +from unittest.mock import patch import pytest @@ -10,7 +11,6 @@ from homeassistant.helpers import device_registry from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import ( MockConfigEntry, async_get_device_automation_capabilities, diff --git a/tests/components/rest/test_binary_sensor.py b/tests/components/rest/test_binary_sensor.py index 2638477ef79..9adb04ea40c 100644 --- a/tests/components/rest/test_binary_sensor.py +++ b/tests/components/rest/test_binary_sensor.py @@ -2,6 +2,7 @@ import asyncio from os import path +from unittest.mock import patch import httpx import respx @@ -18,8 +19,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import patch - async def test_setup_missing_basic_config(hass): """Test setup with configuration missing required entries.""" diff --git a/tests/components/rest/test_notify.py b/tests/components/rest/test_notify.py index 49f3876b97c..aa3e40c2dd4 100644 --- a/tests/components/rest/test_notify.py +++ b/tests/components/rest/test_notify.py @@ -1,5 +1,6 @@ """The tests for the rest.notify platform.""" from os import path +from unittest.mock import patch from homeassistant import config as hass_config import homeassistant.components.notify as notify @@ -7,8 +8,6 @@ from homeassistant.components.rest import DOMAIN from homeassistant.const import SERVICE_RELOAD from homeassistant.setup import async_setup_component -from tests.async_mock import patch - async def test_reload_notify(hass): """Verify we can reload the notify service.""" diff --git a/tests/components/rest/test_sensor.py b/tests/components/rest/test_sensor.py index 16d3f8ba0ac..58309cd7532 100644 --- a/tests/components/rest/test_sensor.py +++ b/tests/components/rest/test_sensor.py @@ -1,6 +1,7 @@ """The tests for the REST sensor platform.""" import asyncio from os import path +from unittest.mock import patch import httpx import respx @@ -18,8 +19,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import patch - async def test_setup_missing_config(hass): """Test setup with configuration missing required entries.""" diff --git a/tests/components/rflink/test_binary_sensor.py b/tests/components/rflink/test_binary_sensor.py index e20d2554f97..118a3689fc7 100644 --- a/tests/components/rflink/test_binary_sensor.py +++ b/tests/components/rflink/test_binary_sensor.py @@ -5,6 +5,7 @@ Test setup of rflink sensor component/platform. Verify manual and automatic sensor creation. """ from datetime import timedelta +from unittest.mock import patch from homeassistant.components.rflink import CONF_RECONNECT_INTERVAL from homeassistant.const import ( @@ -16,7 +17,6 @@ from homeassistant.const import ( import homeassistant.core as ha import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import async_fire_time_changed from tests.components.rflink.test_init import mock_rflink diff --git a/tests/components/rflink/test_init.py b/tests/components/rflink/test_init.py index 2ae3724ee66..7ba90286e62 100644 --- a/tests/components/rflink/test_init.py +++ b/tests/components/rflink/test_init.py @@ -1,5 +1,7 @@ """Common functions for RFLink component tests and generic platform tests.""" +from unittest.mock import Mock + import pytest from voluptuous.error import MultipleInvalid @@ -15,8 +17,6 @@ from homeassistant.components.rflink import ( ) from homeassistant.const import ATTR_ENTITY_ID, SERVICE_STOP_COVER, SERVICE_TURN_OFF -from tests.async_mock import Mock - async def mock_rflink( hass, config, domain, monkeypatch, failures=None, failcommand=False diff --git a/tests/components/rfxtrx/conftest.py b/tests/components/rfxtrx/conftest.py index 563fb362e5a..ee695bee9dd 100644 --- a/tests/components/rfxtrx/conftest.py +++ b/tests/components/rfxtrx/conftest.py @@ -1,5 +1,6 @@ """Common test tools.""" from datetime import timedelta +from unittest.mock import patch import pytest @@ -7,7 +8,6 @@ from homeassistant.components import rfxtrx from homeassistant.components.rfxtrx import DOMAIN from homeassistant.util.dt import utcnow -from tests.async_mock import patch from tests.common import MockConfigEntry, async_fire_time_changed from tests.components.light.conftest import mock_light_profiles # noqa diff --git a/tests/components/rfxtrx/test_config_flow.py b/tests/components/rfxtrx/test_config_flow.py index 04545a1a422..5d4f5edaf2a 100644 --- a/tests/components/rfxtrx/test_config_flow.py +++ b/tests/components/rfxtrx/test_config_flow.py @@ -1,5 +1,6 @@ """Test the Tado config flow.""" import os +from unittest.mock import MagicMock, patch, sentinel import serial.tools.list_ports @@ -13,7 +14,6 @@ from homeassistant.helpers.entity_registry import ( async_get_registry as async_get_entity_registry, ) -from tests.async_mock import MagicMock, patch, sentinel from tests.common import MockConfigEntry diff --git a/tests/components/rfxtrx/test_init.py b/tests/components/rfxtrx/test_init.py index 037b08b7cc6..c2e1870638f 100644 --- a/tests/components/rfxtrx/test_init.py +++ b/tests/components/rfxtrx/test_init.py @@ -1,11 +1,12 @@ """The tests for the Rfxtrx component.""" +from unittest.mock import call + from homeassistant.components.rfxtrx import DOMAIN from homeassistant.components.rfxtrx.const import EVENT_RFXTRX_EVENT from homeassistant.core import callback from homeassistant.setup import async_setup_component -from tests.async_mock import call from tests.common import MockConfigEntry from tests.components.rfxtrx.conftest import create_rfx_test_cfg diff --git a/tests/components/ring/common.py b/tests/components/ring/common.py index 39b5c339677..93a6e4f91e0 100644 --- a/tests/components/ring/common.py +++ b/tests/components/ring/common.py @@ -1,8 +1,9 @@ """Common methods used across the tests for ring devices.""" +from unittest.mock import patch + from homeassistant.components.ring import DOMAIN from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/ring/test_binary_sensor.py b/tests/components/ring/test_binary_sensor.py index 8edaf2c229b..0b73c739503 100644 --- a/tests/components/ring/test_binary_sensor.py +++ b/tests/components/ring/test_binary_sensor.py @@ -1,10 +1,9 @@ """The tests for the Ring binary sensor platform.""" from time import time +from unittest.mock import patch from .common import setup_platform -from tests.async_mock import patch - async def test_binary_sensor(hass, requests_mock): """Test the Ring binary sensors.""" diff --git a/tests/components/ring/test_config_flow.py b/tests/components/ring/test_config_flow.py index fc2b490f560..85ca4ffb558 100644 --- a/tests/components/ring/test_config_flow.py +++ b/tests/components/ring/test_config_flow.py @@ -1,10 +1,10 @@ """Test the Ring config flow.""" +from unittest.mock import Mock, patch + from homeassistant import config_entries, setup from homeassistant.components.ring import DOMAIN from homeassistant.components.ring.config_flow import InvalidAuth -from tests.async_mock import Mock, patch - async def test_form(hass): """Test we get the form.""" diff --git a/tests/components/risco/test_alarm_control_panel.py b/tests/components/risco/test_alarm_control_panel.py index bf7c971df54..5bde97f8abd 100644 --- a/tests/components/risco/test_alarm_control_panel.py +++ b/tests/components/risco/test_alarm_control_panel.py @@ -1,4 +1,6 @@ """Tests for the Risco alarm control panel device.""" +from unittest.mock import MagicMock, PropertyMock, patch + import pytest from homeassistant.components.alarm_control_panel import DOMAIN as ALARM_DOMAIN @@ -29,7 +31,6 @@ from homeassistant.helpers.entity_component import async_update_entity from .util import TEST_CONFIG, TEST_SITE_UUID, setup_risco -from tests.async_mock import MagicMock, PropertyMock, patch from tests.common import MockConfigEntry FIRST_ENTITY_ID = "alarm_control_panel.risco_test_site_name_partition_0" diff --git a/tests/components/risco/test_binary_sensor.py b/tests/components/risco/test_binary_sensor.py index 50b9c43c5c3..2f750ff6d35 100644 --- a/tests/components/risco/test_binary_sensor.py +++ b/tests/components/risco/test_binary_sensor.py @@ -1,4 +1,6 @@ """Tests for the Risco binary sensors.""" +from unittest.mock import PropertyMock, patch + from homeassistant.components.risco import CannotConnectError, UnauthorizedError from homeassistant.components.risco.const import DOMAIN from homeassistant.const import STATE_OFF, STATE_ON @@ -7,7 +9,6 @@ from homeassistant.helpers.entity_component import async_update_entity from .util import TEST_CONFIG, TEST_SITE_UUID, setup_risco from .util import two_zone_alarm # noqa: F401 -from tests.async_mock import PropertyMock, patch from tests.common import MockConfigEntry FIRST_ENTITY_ID = "binary_sensor.zone_0" diff --git a/tests/components/risco/test_config_flow.py b/tests/components/risco/test_config_flow.py index ba14a52553e..cfb1a410960 100644 --- a/tests/components/risco/test_config_flow.py +++ b/tests/components/risco/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Risco config flow.""" +from unittest.mock import PropertyMock, patch + import pytest import voluptuous as vol @@ -9,7 +11,6 @@ from homeassistant.components.risco.config_flow import ( ) from homeassistant.components.risco.const import DOMAIN -from tests.async_mock import PropertyMock, patch from tests.common import MockConfigEntry TEST_SITE_NAME = "test-site-name" diff --git a/tests/components/risco/test_sensor.py b/tests/components/risco/test_sensor.py index acb92088478..09726727901 100644 --- a/tests/components/risco/test_sensor.py +++ b/tests/components/risco/test_sensor.py @@ -1,4 +1,6 @@ """Tests for the Risco event sensors.""" +from unittest.mock import MagicMock, patch + from homeassistant.components.risco import ( LAST_EVENT_TIMESTAMP_KEY, CannotConnectError, @@ -9,7 +11,6 @@ from homeassistant.components.risco.const import DOMAIN, EVENTS_COORDINATOR from .util import TEST_CONFIG, setup_risco from .util import two_zone_alarm # noqa: F401 -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry ENTITY_IDS = { diff --git a/tests/components/risco/util.py b/tests/components/risco/util.py index 704c12fb846..009f8c22fb1 100644 --- a/tests/components/risco/util.py +++ b/tests/components/risco/util.py @@ -1,10 +1,11 @@ """Utilities for Risco tests.""" +from unittest.mock import MagicMock, PropertyMock, patch + from pytest import fixture from homeassistant.components.risco.const import DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_PIN, CONF_USERNAME -from tests.async_mock import MagicMock, PropertyMock, patch from tests.common import MockConfigEntry TEST_CONFIG = { diff --git a/tests/components/rmvtransport/test_sensor.py b/tests/components/rmvtransport/test_sensor.py index 935368f03b1..a1022d2f4b0 100644 --- a/tests/components/rmvtransport/test_sensor.py +++ b/tests/components/rmvtransport/test_sensor.py @@ -1,10 +1,9 @@ """The tests for the rmvtransport platform.""" import datetime +from unittest.mock import patch from homeassistant.setup import async_setup_component -from tests.async_mock import patch - VALID_CONFIG_MINIMAL = { "sensor": {"platform": "rmvtransport", "next_departure": [{"station": "3000010"}]} } diff --git a/tests/components/roku/test_config_flow.py b/tests/components/roku/test_config_flow.py index 16e4a434dc3..ed1b042e328 100644 --- a/tests/components/roku/test_config_flow.py +++ b/tests/components/roku/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Roku config flow.""" +from unittest.mock import patch + from homeassistant.components.roku.const import DOMAIN from homeassistant.config_entries import SOURCE_HOMEKIT, SOURCE_SSDP, SOURCE_USER from homeassistant.const import CONF_HOST, CONF_NAME, CONF_SOURCE @@ -10,7 +12,6 @@ from homeassistant.data_entry_flow import ( from homeassistant.helpers.typing import HomeAssistantType from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.components.roku import ( HOMEKIT_HOST, HOST, diff --git a/tests/components/roku/test_init.py b/tests/components/roku/test_init.py index b929a48ee25..a5f16c6071f 100644 --- a/tests/components/roku/test_init.py +++ b/tests/components/roku/test_init.py @@ -1,4 +1,6 @@ """Tests for the Roku integration.""" +from unittest.mock import patch + from homeassistant.components.roku.const import DOMAIN from homeassistant.config_entries import ( ENTRY_STATE_LOADED, @@ -7,7 +9,6 @@ from homeassistant.config_entries import ( ) from homeassistant.helpers.typing import HomeAssistantType -from tests.async_mock import patch from tests.components.roku import setup_integration from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/roku/test_media_player.py b/tests/components/roku/test_media_player.py index 23dd9dbc6c8..5e9e4c43d54 100644 --- a/tests/components/roku/test_media_player.py +++ b/tests/components/roku/test_media_player.py @@ -1,5 +1,6 @@ """Tests for the Roku Media Player platform.""" from datetime import timedelta +from unittest.mock import patch from rokuecp import RokuError @@ -62,7 +63,6 @@ from homeassistant.const import ( from homeassistant.helpers.typing import HomeAssistantType from homeassistant.util import dt as dt_util -from tests.async_mock import patch from tests.common import async_fire_time_changed from tests.components.roku import UPNP_SERIAL, setup_integration from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/roku/test_remote.py b/tests/components/roku/test_remote.py index 96426e5b10a..4122e0af1d1 100644 --- a/tests/components/roku/test_remote.py +++ b/tests/components/roku/test_remote.py @@ -1,4 +1,6 @@ """The tests for the Roku remote platform.""" +from unittest.mock import patch + from homeassistant.components.remote import ( ATTR_COMMAND, DOMAIN as REMOTE_DOMAIN, @@ -7,7 +9,6 @@ from homeassistant.components.remote import ( from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON from homeassistant.helpers.typing import HomeAssistantType -from tests.async_mock import patch from tests.components.roku import UPNP_SERIAL, setup_integration from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/roomba/test_config_flow.py b/tests/components/roomba/test_config_flow.py index 253250d7d49..54ef229ec49 100644 --- a/tests/components/roomba/test_config_flow.py +++ b/tests/components/roomba/test_config_flow.py @@ -1,4 +1,6 @@ """Test the iRobot Roomba config flow.""" +from unittest.mock import MagicMock, PropertyMock, patch + from roombapy import RoombaConnectionError from homeassistant import config_entries, data_entry_flow, setup @@ -10,7 +12,6 @@ from homeassistant.components.roomba.const import ( ) from homeassistant.const import CONF_HOST, CONF_PASSWORD -from tests.async_mock import MagicMock, PropertyMock, patch from tests.common import MockConfigEntry VALID_CONFIG = {CONF_HOST: "1.2.3.4", CONF_BLID: "blid", CONF_PASSWORD: "password"} diff --git a/tests/components/roon/test_config_flow.py b/tests/components/roon/test_config_flow.py index 7ffac08d9f6..6fcfc048d4b 100644 --- a/tests/components/roon/test_config_flow.py +++ b/tests/components/roon/test_config_flow.py @@ -1,9 +1,10 @@ """Test the roon config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, setup from homeassistant.components.roon.const import DOMAIN from homeassistant.const import CONF_HOST -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/rpi_power/test_binary_sensor.py b/tests/components/rpi_power/test_binary_sensor.py index 873f654aa3b..13d452a2902 100644 --- a/tests/components/rpi_power/test_binary_sensor.py +++ b/tests/components/rpi_power/test_binary_sensor.py @@ -1,6 +1,7 @@ """Tests for rpi_power binary sensor.""" from datetime import timedelta import logging +from unittest.mock import MagicMock from homeassistant.components.rpi_power.binary_sensor import ( DESCRIPTION_NORMALIZED, @@ -11,7 +12,6 @@ from homeassistant.const import STATE_OFF, STATE_ON from homeassistant.setup import async_setup_component from homeassistant.util import dt as dt_util -from tests.async_mock import MagicMock from tests.common import MockConfigEntry, async_fire_time_changed, patch ENTITY_ID = "binary_sensor.rpi_power_status" diff --git a/tests/components/rpi_power/test_config_flow.py b/tests/components/rpi_power/test_config_flow.py index 090b6a6a793..7e302b51512 100644 --- a/tests/components/rpi_power/test_config_flow.py +++ b/tests/components/rpi_power/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for rpi_power config flow.""" +from unittest.mock import MagicMock + from homeassistant.components.rpi_power.const import DOMAIN from homeassistant.config_entries import SOURCE_USER from homeassistant.core import HomeAssistant @@ -8,7 +10,6 @@ from homeassistant.data_entry_flow import ( RESULT_TYPE_FORM, ) -from tests.async_mock import MagicMock from tests.common import patch MODULE = "homeassistant.components.rpi_power.config_flow.new_under_voltage" diff --git a/tests/components/ruckus_unleashed/__init__.py b/tests/components/ruckus_unleashed/__init__.py index 7efbfc03457..eff80a0387a 100644 --- a/tests/components/ruckus_unleashed/__init__.py +++ b/tests/components/ruckus_unleashed/__init__.py @@ -1,4 +1,6 @@ """Tests for the Ruckus Unleashed integration.""" +from unittest.mock import patch + from homeassistant.components.ruckus_unleashed import DOMAIN from homeassistant.components.ruckus_unleashed.const import ( API_ACCESS_POINT, @@ -15,7 +17,6 @@ from homeassistant.components.ruckus_unleashed.const import ( ) from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry DEFAULT_TITLE = "Ruckus Mesh" diff --git a/tests/components/ruckus_unleashed/test_config_flow.py b/tests/components/ruckus_unleashed/test_config_flow.py index 39112dd44aa..a11943bff00 100644 --- a/tests/components/ruckus_unleashed/test_config_flow.py +++ b/tests/components/ruckus_unleashed/test_config_flow.py @@ -1,5 +1,6 @@ """Test the Ruckus Unleashed config flow.""" from datetime import timedelta +from unittest.mock import patch from pyruckus.exceptions import AuthenticationError @@ -7,7 +8,6 @@ from homeassistant import config_entries from homeassistant.components.ruckus_unleashed.const import DOMAIN from homeassistant.util import utcnow -from tests.async_mock import patch from tests.common import async_fire_time_changed from tests.components.ruckus_unleashed import CONFIG, DEFAULT_SYSTEM_INFO, DEFAULT_TITLE diff --git a/tests/components/ruckus_unleashed/test_device_tracker.py b/tests/components/ruckus_unleashed/test_device_tracker.py index 38736b0117f..37bae441abf 100644 --- a/tests/components/ruckus_unleashed/test_device_tracker.py +++ b/tests/components/ruckus_unleashed/test_device_tracker.py @@ -1,5 +1,6 @@ """The sensor tests for the Ruckus Unleashed platform.""" from datetime import timedelta +from unittest.mock import patch from homeassistant.components.ruckus_unleashed import API_MAC, DOMAIN from homeassistant.components.ruckus_unleashed.const import API_AP, API_ID, API_NAME @@ -8,7 +9,6 @@ from homeassistant.helpers import entity_registry from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC from homeassistant.util import utcnow -from tests.async_mock import patch from tests.common import async_fire_time_changed from tests.components.ruckus_unleashed import ( DEFAULT_AP_INFO, diff --git a/tests/components/ruckus_unleashed/test_init.py b/tests/components/ruckus_unleashed/test_init.py index 5c694a5ee24..7b379a51011 100644 --- a/tests/components/ruckus_unleashed/test_init.py +++ b/tests/components/ruckus_unleashed/test_init.py @@ -1,4 +1,6 @@ """Test the Ruckus Unleashed config flow.""" +from unittest.mock import patch + from pyruckus.exceptions import AuthenticationError from homeassistant.components.ruckus_unleashed import ( @@ -19,7 +21,6 @@ from homeassistant.config_entries import ( ) from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC -from tests.async_mock import patch from tests.components.ruckus_unleashed import ( DEFAULT_AP_INFO, DEFAULT_SYSTEM_INFO, diff --git a/tests/components/samsungtv/test_config_flow.py b/tests/components/samsungtv/test_config_flow.py index f8a362e9842..ea78ecacb3e 100644 --- a/tests/components/samsungtv/test_config_flow.py +++ b/tests/components/samsungtv/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for Samsung TV config flow.""" +from unittest.mock import DEFAULT as DEFAULT_MOCK, Mock, PropertyMock, call, patch + import pytest from samsungctl.exceptions import AccessDenied, UnhandledResponse from samsungtvws.exceptions import ConnectionFailure @@ -18,8 +20,6 @@ from homeassistant.components.ssdp import ( ) from homeassistant.const import CONF_HOST, CONF_ID, CONF_METHOD, CONF_NAME, CONF_TOKEN -from tests.async_mock import DEFAULT as DEFAULT_MOCK, Mock, PropertyMock, call, patch - MOCK_USER_DATA = {CONF_HOST: "fake_host", CONF_NAME: "fake_name"} MOCK_SSDP_DATA = { ATTR_SSDP_LOCATION: "https://fake_host:12345/test", diff --git a/tests/components/samsungtv/test_init.py b/tests/components/samsungtv/test_init.py index 5ef47cb3106..bb19f120cf6 100644 --- a/tests/components/samsungtv/test_init.py +++ b/tests/components/samsungtv/test_init.py @@ -1,4 +1,6 @@ """Tests for the Samsung TV Integration.""" +from unittest.mock import Mock, call, patch + import pytest from homeassistant.components.media_player.const import DOMAIN, SUPPORT_TURN_ON @@ -16,8 +18,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, call, patch - ENTITY_ID = f"{DOMAIN}.fake_name" MOCK_CONFIG = { SAMSUNGTV_DOMAIN: [ diff --git a/tests/components/samsungtv/test_media_player.py b/tests/components/samsungtv/test_media_player.py index cc9a0f37ec8..6415f02cdf5 100644 --- a/tests/components/samsungtv/test_media_player.py +++ b/tests/components/samsungtv/test_media_player.py @@ -2,6 +2,7 @@ import asyncio from datetime import timedelta import logging +from unittest.mock import DEFAULT as DEFAULT_MOCK, Mock, PropertyMock, call, patch import pytest from samsungctl import exceptions @@ -52,7 +53,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import DEFAULT as DEFAULT_MOCK, Mock, PropertyMock, call, patch from tests.common import MockConfigEntry, async_fire_time_changed ENTITY_ID = f"{DOMAIN}.fake" diff --git a/tests/components/script/test_init.py b/tests/components/script/test_init.py index 068b0b91a2c..95703949525 100644 --- a/tests/components/script/test_init.py +++ b/tests/components/script/test_init.py @@ -2,6 +2,7 @@ # pylint: disable=protected-access import asyncio import unittest +from unittest.mock import Mock, patch import pytest @@ -23,7 +24,6 @@ from homeassistant.helpers.service import async_get_all_descriptions from homeassistant.loader import bind_hass from homeassistant.setup import async_setup_component, setup_component -from tests.async_mock import Mock, patch from tests.common import async_mock_service, get_test_home_assistant from tests.components.logbook.test_init import MockLazyEventPartialState diff --git a/tests/components/season/test_sensor.py b/tests/components/season/test_sensor.py index 943036e9c00..d1c6cfb0b9f 100644 --- a/tests/components/season/test_sensor.py +++ b/tests/components/season/test_sensor.py @@ -1,5 +1,6 @@ """The tests for the Season sensor platform.""" from datetime import datetime +from unittest.mock import patch import pytest @@ -14,8 +15,6 @@ from homeassistant.components.season.sensor import ( from homeassistant.const import STATE_UNKNOWN from homeassistant.setup import async_setup_component -from tests.async_mock import patch - HEMISPHERE_NORTHERN = { "homeassistant": {"latitude": "48.864716", "longitude": "2.349014"}, "sensor": {"platform": "season", "type": "astronomical"}, diff --git a/tests/components/sense/test_config_flow.py b/tests/components/sense/test_config_flow.py index 44bd9c7265c..41cfdc017dd 100644 --- a/tests/components/sense/test_config_flow.py +++ b/tests/components/sense/test_config_flow.py @@ -1,11 +1,11 @@ """Test the Sense config flow.""" +from unittest.mock import patch + from sense_energy import SenseAPITimeoutException, SenseAuthenticationException from homeassistant import config_entries, setup from homeassistant.components.sense.const import DOMAIN -from tests.async_mock import patch - async def test_form(hass): """Test we get the form.""" diff --git a/tests/components/sentry/test_config_flow.py b/tests/components/sentry/test_config_flow.py index 9ae572123b5..82a1a70ec8b 100644 --- a/tests/components/sentry/test_config_flow.py +++ b/tests/components/sentry/test_config_flow.py @@ -1,5 +1,6 @@ """Test the sentry config flow.""" import logging +from unittest.mock import patch from sentry_sdk.utils import BadDsn @@ -18,7 +19,6 @@ from homeassistant.config_entries import SOURCE_USER from homeassistant.data_entry_flow import RESULT_TYPE_ABORT, RESULT_TYPE_FORM from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/sentry/test_init.py b/tests/components/sentry/test_init.py index 95bda9738b8..e920437b2f7 100644 --- a/tests/components/sentry/test_init.py +++ b/tests/components/sentry/test_init.py @@ -1,5 +1,6 @@ """Tests for Sentry integration.""" import logging +from unittest.mock import MagicMock, Mock, patch import pytest @@ -17,7 +18,6 @@ from homeassistant.components.sentry.const import ( from homeassistant.const import __version__ as current_version from homeassistant.core import HomeAssistant -from tests.async_mock import MagicMock, Mock, patch from tests.common import MockConfigEntry diff --git a/tests/components/seventeentrack/test_sensor.py b/tests/components/seventeentrack/test_sensor.py index 798620e2af7..6519b435c0a 100644 --- a/tests/components/seventeentrack/test_sensor.py +++ b/tests/components/seventeentrack/test_sensor.py @@ -1,6 +1,7 @@ """Tests for the seventeentrack sensor.""" import datetime from typing import Union +from unittest.mock import MagicMock, patch from py17track.package import Package import pytest @@ -13,7 +14,6 @@ from homeassistant.const import CONF_PASSWORD, CONF_USERNAME from homeassistant.setup import async_setup_component from homeassistant.util import utcnow -from tests.async_mock import MagicMock, patch from tests.common import async_fire_time_changed VALID_CONFIG_MINIMAL = { diff --git a/tests/components/sharkiq/test_config_flow.py b/tests/components/sharkiq/test_config_flow.py index 3183f6fdee2..890efbf1679 100644 --- a/tests/components/sharkiq/test_config_flow.py +++ b/tests/components/sharkiq/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Shark IQ config flow.""" +from unittest.mock import patch + import aiohttp import pytest from sharkiqpy import AylaApi, SharkIqAuthError @@ -9,7 +11,6 @@ from homeassistant.core import HomeAssistant from .const import CONFIG, TEST_PASSWORD, TEST_USERNAME, UNIQUE_ID -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/sharkiq/test_vacuum.py b/tests/components/sharkiq/test_vacuum.py index c548b59f5ba..a894869a723 100644 --- a/tests/components/sharkiq/test_vacuum.py +++ b/tests/components/sharkiq/test_vacuum.py @@ -2,6 +2,7 @@ from copy import deepcopy import enum from typing import Any, Iterable, List, Optional +from unittest.mock import patch import pytest from sharkiqpy import AylaApi, SharkIqAuthError, SharkIqNotAuthedError, SharkIqVacuum @@ -56,7 +57,6 @@ from .const import ( TEST_USERNAME, ) -from tests.async_mock import patch from tests.common import MockConfigEntry VAC_ENTITY_ID = f"vacuum.{SHARK_DEVICE_DICT['product_name'].lower()}" diff --git a/tests/components/shell_command/test_init.py b/tests/components/shell_command/test_init.py index f5ad37cc617..928c186bc11 100644 --- a/tests/components/shell_command/test_init.py +++ b/tests/components/shell_command/test_init.py @@ -3,12 +3,11 @@ import os import tempfile from typing import Tuple +from unittest.mock import MagicMock, patch from homeassistant.components import shell_command from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, patch - def mock_process_creator(error: bool = False): """Mock a coroutine that creates a process when yielded.""" diff --git a/tests/components/shelly/conftest.py b/tests/components/shelly/conftest.py index 3f97c0ef317..eb19813dc95 100644 --- a/tests/components/shelly/conftest.py +++ b/tests/components/shelly/conftest.py @@ -1,7 +1,7 @@ """Test configuration for Shelly.""" -import pytest +from unittest.mock import patch -from tests.async_mock import patch +import pytest @pytest.fixture(autouse=True) diff --git a/tests/components/shelly/test_config_flow.py b/tests/components/shelly/test_config_flow.py index 2850be11450..ca62e41abd6 100644 --- a/tests/components/shelly/test_config_flow.py +++ b/tests/components/shelly/test_config_flow.py @@ -1,5 +1,6 @@ """Test the Shelly config flow.""" import asyncio +from unittest.mock import AsyncMock, Mock, patch import aiohttp import aioshelly @@ -8,7 +9,6 @@ import pytest from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.shelly.const import DOMAIN -from tests.async_mock import AsyncMock, Mock, patch from tests.common import MockConfigEntry MOCK_SETTINGS = { diff --git a/tests/components/shopping_list/conftest.py b/tests/components/shopping_list/conftest.py index 8307a6845b1..596a8c87cd3 100644 --- a/tests/components/shopping_list/conftest.py +++ b/tests/components/shopping_list/conftest.py @@ -1,9 +1,10 @@ """Shopping list test helpers.""" +from unittest.mock import patch + import pytest from homeassistant.components.shopping_list import intent as sl_intent -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/signal_messenger/test_notify.py b/tests/components/signal_messenger/test_notify.py index 407068e6f3e..4bb6cbdd197 100644 --- a/tests/components/signal_messenger/test_notify.py +++ b/tests/components/signal_messenger/test_notify.py @@ -3,6 +3,7 @@ import os import tempfile import unittest +from unittest.mock import patch from pysignalclirestapi import SignalCliRestApi import requests_mock @@ -10,8 +11,6 @@ import requests_mock import homeassistant.components.signal_messenger.notify as signalmessenger from homeassistant.setup import async_setup_component -from tests.async_mock import patch - BASE_COMPONENT = "notify" diff --git a/tests/components/simplisafe/test_config_flow.py b/tests/components/simplisafe/test_config_flow.py index ec7ad592f15..8f9d3a9897c 100644 --- a/tests/components/simplisafe/test_config_flow.py +++ b/tests/components/simplisafe/test_config_flow.py @@ -1,4 +1,6 @@ """Define tests for the SimpliSafe config flow.""" +from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch + from simplipy.errors import ( InvalidCredentialsError, PendingAuthorizationError, @@ -10,7 +12,6 @@ from homeassistant.components.simplisafe import DOMAIN from homeassistant.config_entries import SOURCE_USER from homeassistant.const import CONF_CODE, CONF_PASSWORD, CONF_TOKEN, CONF_USERNAME -from tests.async_mock import AsyncMock, MagicMock, PropertyMock, patch from tests.common import MockConfigEntry diff --git a/tests/components/slack/test_notify.py b/tests/components/slack/test_notify.py index bfd78b20900..7f974b557fe 100644 --- a/tests/components/slack/test_notify.py +++ b/tests/components/slack/test_notify.py @@ -1,10 +1,8 @@ """Test slack notifications.""" -from unittest.mock import Mock +from unittest.mock import AsyncMock, Mock from homeassistant.components.slack.notify import SlackNotificationService -from tests.async_mock import AsyncMock - async def test_message_includes_default_emoji(): """Tests that default icon is used when no message icon is given.""" diff --git a/tests/components/sleepiq/test_binary_sensor.py b/tests/components/sleepiq/test_binary_sensor.py index c1577a21cd2..c158554b278 100644 --- a/tests/components/sleepiq/test_binary_sensor.py +++ b/tests/components/sleepiq/test_binary_sensor.py @@ -1,8 +1,9 @@ """The tests for SleepIQ binary sensor platform.""" +from unittest.mock import MagicMock + from homeassistant.components.sleepiq import binary_sensor as sleepiq from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock from tests.components.sleepiq.test_init import mock_responses CONFIG = {"username": "foo", "password": "bar"} diff --git a/tests/components/sleepiq/test_init.py b/tests/components/sleepiq/test_init.py index 70aaca2e17d..a5e8e43ae07 100644 --- a/tests/components/sleepiq/test_init.py +++ b/tests/components/sleepiq/test_init.py @@ -1,8 +1,9 @@ """The tests for the SleepIQ component.""" +from unittest.mock import MagicMock, patch + from homeassistant import setup import homeassistant.components.sleepiq as sleepiq -from tests.async_mock import MagicMock, patch from tests.common import load_fixture CONFIG = {"sleepiq": {"username": "foo", "password": "bar"}} diff --git a/tests/components/sleepiq/test_sensor.py b/tests/components/sleepiq/test_sensor.py index 53ee4de973f..559e808f554 100644 --- a/tests/components/sleepiq/test_sensor.py +++ b/tests/components/sleepiq/test_sensor.py @@ -1,8 +1,9 @@ """The tests for SleepIQ sensor platform.""" +from unittest.mock import MagicMock + import homeassistant.components.sleepiq.sensor as sleepiq from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock from tests.components.sleepiq.test_init import mock_responses CONFIG = {"username": "foo", "password": "bar"} diff --git a/tests/components/smappee/test_config_flow.py b/tests/components/smappee/test_config_flow.py index 55d063c2b1c..cba962d3e44 100644 --- a/tests/components/smappee/test_config_flow.py +++ b/tests/components/smappee/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Smappee component config flow module.""" +from unittest.mock import patch + from homeassistant import data_entry_flow, setup from homeassistant.components.smappee.const import ( CONF_HOSTNAME, @@ -12,7 +14,6 @@ from homeassistant.config_entries import SOURCE_USER, SOURCE_ZEROCONF from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET from homeassistant.helpers import config_entry_oauth2_flow -from tests.async_mock import patch from tests.common import MockConfigEntry CLIENT_ID = "1234" diff --git a/tests/components/smappee/test_init.py b/tests/components/smappee/test_init.py index 9a81441e8b3..a3cd9897d9c 100644 --- a/tests/components/smappee/test_init.py +++ b/tests/components/smappee/test_init.py @@ -1,8 +1,9 @@ """Tests for the Smappee component init module.""" +from unittest.mock import patch + from homeassistant.components.smappee.const import DOMAIN from homeassistant.config_entries import SOURCE_ZEROCONF -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/smart_meter_texas/test_config_flow.py b/tests/components/smart_meter_texas/test_config_flow.py index 4908a50e57d..d0108f2ee09 100644 --- a/tests/components/smart_meter_texas/test_config_flow.py +++ b/tests/components/smart_meter_texas/test_config_flow.py @@ -1,5 +1,6 @@ """Test the Smart Meter Texas config flow.""" import asyncio +from unittest.mock import patch from aiohttp import ClientError import pytest @@ -12,7 +13,6 @@ from homeassistant import config_entries, setup from homeassistant.components.smart_meter_texas.const import DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry TEST_LOGIN = {CONF_USERNAME: "test-username", CONF_PASSWORD: "test-password"} diff --git a/tests/components/smart_meter_texas/test_init.py b/tests/components/smart_meter_texas/test_init.py index 861425601ec..7db4113e3cf 100644 --- a/tests/components/smart_meter_texas/test_init.py +++ b/tests/components/smart_meter_texas/test_init.py @@ -1,4 +1,6 @@ """Test the Smart Meter Texas module.""" +from unittest.mock import patch + from homeassistant.components.homeassistant import ( DOMAIN as HA_DOMAIN, SERVICE_UPDATE_ENTITY, @@ -15,8 +17,6 @@ from homeassistant.setup import async_setup_component from .conftest import TEST_ENTITY_ID, setup_integration -from tests.async_mock import patch - async def test_setup_with_no_config(hass): """Test that no config is successful.""" diff --git a/tests/components/smart_meter_texas/test_sensor.py b/tests/components/smart_meter_texas/test_sensor.py index 104da011d90..774a369c83a 100644 --- a/tests/components/smart_meter_texas/test_sensor.py +++ b/tests/components/smart_meter_texas/test_sensor.py @@ -1,4 +1,6 @@ """Test the Smart Meter Texas sensor entity.""" +from unittest.mock import patch + from homeassistant.components.homeassistant import ( DOMAIN as HA_DOMAIN, SERVICE_UPDATE_ENTITY, @@ -13,8 +15,6 @@ from homeassistant.setup import async_setup_component from .conftest import TEST_ENTITY_ID, refresh_data, setup_integration -from tests.async_mock import patch - async def test_sensor(hass, config_entry, aioclient_mock): """Test that the sensor is setup.""" diff --git a/tests/components/smarthab/test_config_flow.py b/tests/components/smarthab/test_config_flow.py index 6b8c58b1f70..6201d6f6f28 100644 --- a/tests/components/smarthab/test_config_flow.py +++ b/tests/components/smarthab/test_config_flow.py @@ -1,12 +1,12 @@ """Test the SmartHab config flow.""" +from unittest.mock import patch + import pysmarthab from homeassistant import config_entries, setup from homeassistant.components.smarthab import DOMAIN from homeassistant.const import CONF_EMAIL, CONF_PASSWORD -from tests.async_mock import patch - async def test_form(hass): """Test we get the form.""" diff --git a/tests/components/smartthings/conftest.py b/tests/components/smartthings/conftest.py index 8588c81654e..b99309bea52 100644 --- a/tests/components/smartthings/conftest.py +++ b/tests/components/smartthings/conftest.py @@ -1,5 +1,6 @@ """Test configuration and mocks for the SmartThings component.""" import secrets +from unittest.mock import Mock, patch from uuid import uuid4 from pysmartthings import ( @@ -45,7 +46,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, patch from tests.common import MockConfigEntry from tests.components.light.conftest import mock_light_profiles # noqa diff --git a/tests/components/smartthings/test_config_flow.py b/tests/components/smartthings/test_config_flow.py index b776959ea5b..d8e0f6ed784 100644 --- a/tests/components/smartthings/test_config_flow.py +++ b/tests/components/smartthings/test_config_flow.py @@ -1,4 +1,5 @@ """Tests for the SmartThings config flow module.""" +from unittest.mock import AsyncMock, Mock, patch from uuid import uuid4 from aiohttp import ClientResponseError @@ -23,7 +24,6 @@ from homeassistant.const import ( HTTP_UNAUTHORIZED, ) -from tests.async_mock import AsyncMock, Mock, patch from tests.common import MockConfigEntry diff --git a/tests/components/smartthings/test_init.py b/tests/components/smartthings/test_init.py index 931e895cb65..9024b72bb85 100644 --- a/tests/components/smartthings/test_init.py +++ b/tests/components/smartthings/test_init.py @@ -1,4 +1,5 @@ """Tests for the SmartThings component init module.""" +from unittest.mock import Mock, patch from uuid import uuid4 from aiohttp import ClientConnectionError, ClientResponseError @@ -22,7 +23,6 @@ from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, patch from tests.common import MockConfigEntry diff --git a/tests/components/smartthings/test_smartapp.py b/tests/components/smartthings/test_smartapp.py index 42215def82f..7f26b26d577 100644 --- a/tests/components/smartthings/test_smartapp.py +++ b/tests/components/smartthings/test_smartapp.py @@ -1,4 +1,5 @@ """Tests for the smartapp module.""" +from unittest.mock import AsyncMock, Mock, patch from uuid import uuid4 from pysmartthings import CAPABILITIES, AppEntity, Capability @@ -10,7 +11,6 @@ from homeassistant.components.smartthings.const import ( DOMAIN, ) -from tests.async_mock import AsyncMock, Mock, patch from tests.common import MockConfigEntry diff --git a/tests/components/smhi/common.py b/tests/components/smhi/common.py index 92c9e13fb8a..6f215840324 100644 --- a/tests/components/smhi/common.py +++ b/tests/components/smhi/common.py @@ -1,5 +1,5 @@ """Common test utilities.""" -from tests.async_mock import Mock +from unittest.mock import Mock class AsyncMock(Mock): diff --git a/tests/components/smhi/test_config_flow.py b/tests/components/smhi/test_config_flow.py index 56a0745c1b3..3f189b52311 100644 --- a/tests/components/smhi/test_config_flow.py +++ b/tests/components/smhi/test_config_flow.py @@ -1,11 +1,11 @@ """Tests for SMHI config flow.""" +from unittest.mock import Mock, patch + from smhi.smhi_lib import Smhi as SmhiApi, SmhiForecastException from homeassistant.components.smhi import config_flow from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE -from tests.async_mock import Mock, patch - # pylint: disable=protected-access async def test_homeassistant_location_exists() -> None: diff --git a/tests/components/smhi/test_init.py b/tests/components/smhi/test_init.py index e6b523d96bb..450ac7e6ef0 100644 --- a/tests/components/smhi/test_init.py +++ b/tests/components/smhi/test_init.py @@ -1,10 +1,10 @@ """Test SMHI component setup process.""" +from unittest.mock import Mock + from homeassistant.components import smhi from .common import AsyncMock -from tests.async_mock import Mock - TEST_CONFIG = { "config": { "name": "0123456789ABCDEF", diff --git a/tests/components/smhi/test_weather.py b/tests/components/smhi/test_weather.py index 050dc663487..9170f3a9ed0 100644 --- a/tests/components/smhi/test_weather.py +++ b/tests/components/smhi/test_weather.py @@ -2,6 +2,7 @@ import asyncio from datetime import datetime import logging +from unittest.mock import AsyncMock, Mock, patch from smhi.smhi_lib import APIURL_TEMPLATE, SmhiForecastException @@ -25,7 +26,6 @@ from homeassistant.components.weather import ( from homeassistant.const import TEMP_CELSIUS from homeassistant.core import HomeAssistant -from tests.async_mock import AsyncMock, Mock, patch from tests.common import MockConfigEntry, load_fixture _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/smtp/test_notify.py b/tests/components/smtp/test_notify.py index 754df5945af..46f8d0efd5f 100644 --- a/tests/components/smtp/test_notify.py +++ b/tests/components/smtp/test_notify.py @@ -1,6 +1,7 @@ """The tests for the notify smtp platform.""" from os import path import re +from unittest.mock import patch import pytest @@ -11,8 +12,6 @@ from homeassistant.components.smtp.notify import MailNotificationService from homeassistant.const import SERVICE_RELOAD from homeassistant.setup import async_setup_component -from tests.async_mock import patch - class MockSMTP(MailNotificationService): """Test SMTP object that doesn't need a working server.""" diff --git a/tests/components/solaredge/test_config_flow.py b/tests/components/solaredge/test_config_flow.py index 835fc300982..4caae0edcfe 100644 --- a/tests/components/solaredge/test_config_flow.py +++ b/tests/components/solaredge/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for the SolarEdge config flow.""" +from unittest.mock import Mock, patch + import pytest from requests.exceptions import ConnectTimeout, HTTPError @@ -7,7 +9,6 @@ from homeassistant.components.solaredge import config_flow from homeassistant.components.solaredge.const import CONF_SITE_ID, DEFAULT_NAME from homeassistant.const import CONF_API_KEY, CONF_NAME -from tests.async_mock import Mock, patch from tests.common import MockConfigEntry NAME = "solaredge site 1 2 3" diff --git a/tests/components/solarlog/test_config_flow.py b/tests/components/solarlog/test_config_flow.py index 8266adfd417..3016a73f1b8 100644 --- a/tests/components/solarlog/test_config_flow.py +++ b/tests/components/solarlog/test_config_flow.py @@ -1,4 +1,6 @@ """Test the solarlog config flow.""" +from unittest.mock import patch + import pytest from homeassistant import config_entries, data_entry_flow, setup @@ -6,7 +8,6 @@ from homeassistant.components.solarlog import config_flow from homeassistant.components.solarlog.const import DEFAULT_HOST, DOMAIN from homeassistant.const import CONF_HOST, CONF_NAME -from tests.async_mock import patch from tests.common import MockConfigEntry NAME = "Solarlog test 1 2 3" diff --git a/tests/components/soma/test_config_flow.py b/tests/components/soma/test_config_flow.py index 929463ecf81..1d00f83a608 100644 --- a/tests/components/soma/test_config_flow.py +++ b/tests/components/soma/test_config_flow.py @@ -1,11 +1,12 @@ """Tests for the Soma config flow.""" +from unittest.mock import patch + from api.soma_api import SomaApi from requests import RequestException from homeassistant import data_entry_flow from homeassistant.components.soma import DOMAIN, config_flow -from tests.async_mock import patch from tests.common import MockConfigEntry MOCK_HOST = "123.45.67.89" diff --git a/tests/components/somfy/test_config_flow.py b/tests/components/somfy/test_config_flow.py index 4276a6a18d4..47adb5bdc91 100644 --- a/tests/components/somfy/test_config_flow.py +++ b/tests/components/somfy/test_config_flow.py @@ -1,5 +1,6 @@ """Tests for the Somfy config flow.""" import asyncio +from unittest.mock import patch import pytest @@ -8,7 +9,6 @@ from homeassistant.components.somfy import DOMAIN, config_flow from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET from homeassistant.helpers import config_entry_oauth2_flow -from tests.async_mock import patch from tests.common import MockConfigEntry CLIENT_ID_VALUE = "1234" diff --git a/tests/components/sonarr/__init__.py b/tests/components/sonarr/__init__.py index 61afac099d3..1313db4460d 100644 --- a/tests/components/sonarr/__init__.py +++ b/tests/components/sonarr/__init__.py @@ -1,5 +1,6 @@ """Tests for the Sonarr component.""" from socket import gaierror as SocketGIAError +from unittest.mock import patch from homeassistant.components.sonarr.const import ( CONF_BASE_PATH, @@ -19,7 +20,6 @@ from homeassistant.const import ( ) from homeassistant.helpers.typing import HomeAssistantType -from tests.async_mock import patch from tests.common import MockConfigEntry, load_fixture from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/sonarr/test_config_flow.py b/tests/components/sonarr/test_config_flow.py index f872f7f8c18..701580ab37c 100644 --- a/tests/components/sonarr/test_config_flow.py +++ b/tests/components/sonarr/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Sonarr config flow.""" +from unittest.mock import patch + from homeassistant.components.sonarr.const import ( CONF_UPCOMING_DAYS, CONF_WANTED_MAX_ITEMS, @@ -15,7 +17,6 @@ from homeassistant.data_entry_flow import ( ) from homeassistant.helpers.typing import HomeAssistantType -from tests.async_mock import patch from tests.components.sonarr import ( HOST, MOCK_REAUTH_INPUT, diff --git a/tests/components/sonarr/test_init.py b/tests/components/sonarr/test_init.py index 258be0203bb..16d33a23072 100644 --- a/tests/components/sonarr/test_init.py +++ b/tests/components/sonarr/test_init.py @@ -1,4 +1,6 @@ """Tests for the Sonsrr integration.""" +from unittest.mock import patch + from homeassistant.components.sonarr.const import DOMAIN from homeassistant.config_entries import ( ENTRY_STATE_LOADED, @@ -10,7 +12,6 @@ from homeassistant.config_entries import ( from homeassistant.const import CONF_SOURCE from homeassistant.core import HomeAssistant -from tests.async_mock import patch from tests.components.sonarr import setup_integration from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/sonarr/test_sensor.py b/tests/components/sonarr/test_sensor.py index 94230c9e726..0b306dc8240 100644 --- a/tests/components/sonarr/test_sensor.py +++ b/tests/components/sonarr/test_sensor.py @@ -1,5 +1,6 @@ """Tests for the Sonarr sensor platform.""" from datetime import timedelta +from unittest.mock import patch import pytest @@ -14,7 +15,6 @@ from homeassistant.const import ( from homeassistant.helpers.typing import HomeAssistantType from homeassistant.util import dt as dt_util -from tests.async_mock import patch from tests.common import async_fire_time_changed from tests.components.sonarr import mock_connection, setup_integration from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/songpal/__init__.py b/tests/components/songpal/__init__.py index bca879268cc..f3004ef22e2 100644 --- a/tests/components/songpal/__init__.py +++ b/tests/components/songpal/__init__.py @@ -1,11 +1,11 @@ """Test the songpal integration.""" +from unittest.mock import AsyncMock, MagicMock, patch + from songpal import SongpalException from homeassistant.components.songpal.const import CONF_ENDPOINT from homeassistant.const import CONF_NAME -from tests.async_mock import AsyncMock, MagicMock, patch - FRIENDLY_NAME = "name" ENTITY_ID = f"media_player.{FRIENDLY_NAME}" HOST = "0.0.0.0" diff --git a/tests/components/songpal/test_config_flow.py b/tests/components/songpal/test_config_flow.py index 155801dca03..a1751bca676 100644 --- a/tests/components/songpal/test_config_flow.py +++ b/tests/components/songpal/test_config_flow.py @@ -1,5 +1,6 @@ """Test the songpal config flow.""" import copy +from unittest.mock import patch from homeassistant.components import ssdp from homeassistant.components.songpal.const import CONF_ENDPOINT, DOMAIN @@ -21,7 +22,6 @@ from . import ( _patch_config_flow_device, ) -from tests.async_mock import patch from tests.common import MockConfigEntry UDN = "uuid:1234" diff --git a/tests/components/songpal/test_init.py b/tests/components/songpal/test_init.py index 9f5de326cc0..8efcab4148b 100644 --- a/tests/components/songpal/test_init.py +++ b/tests/components/songpal/test_init.py @@ -1,4 +1,6 @@ """Tests songpal setup.""" +from unittest.mock import patch + from homeassistant.components import songpal from homeassistant.setup import async_setup_component @@ -9,7 +11,6 @@ from . import ( _patch_media_player_device, ) -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/songpal/test_media_player.py b/tests/components/songpal/test_media_player.py index 61b59ee1b56..b43370b8200 100644 --- a/tests/components/songpal/test_media_player.py +++ b/tests/components/songpal/test_media_player.py @@ -1,6 +1,7 @@ """Test songpal media_player.""" from datetime import timedelta import logging +from unittest.mock import AsyncMock, MagicMock, call, patch from songpal import ( ConnectChange, @@ -32,7 +33,6 @@ from . import ( _patch_media_player_device, ) -from tests.async_mock import AsyncMock, MagicMock, call, patch from tests.common import MockConfigEntry, async_fire_time_changed diff --git a/tests/components/sonos/conftest.py b/tests/components/sonos/conftest.py index f6249d0bc81..1ce2205813b 100644 --- a/tests/components/sonos/conftest.py +++ b/tests/components/sonos/conftest.py @@ -1,11 +1,12 @@ """Configuration for Sonos tests.""" +from unittest.mock import Mock, patch as patch + import pytest from homeassistant.components.media_player import DOMAIN as MP_DOMAIN from homeassistant.components.sonos import DOMAIN from homeassistant.const import CONF_HOSTS -from tests.async_mock import Mock, patch as patch from tests.common import MockConfigEntry diff --git a/tests/components/soundtouch/test_media_player.py b/tests/components/soundtouch/test_media_player.py index 85089854c4d..4ed8a648c77 100644 --- a/tests/components/soundtouch/test_media_player.py +++ b/tests/components/soundtouch/test_media_player.py @@ -1,4 +1,6 @@ """Test the Soundtouch component.""" +from unittest.mock import call, patch + from libsoundtouch.device import ( Config, Preset, @@ -26,8 +28,6 @@ from homeassistant.const import STATE_OFF, STATE_PAUSED, STATE_PLAYING from homeassistant.helpers.discovery import async_load_platform from homeassistant.setup import async_setup_component -from tests.async_mock import call, patch - # pylint: disable=super-init-not-called diff --git a/tests/components/speedtestdotnet/test_config_flow.py b/tests/components/speedtestdotnet/test_config_flow.py index d421113a2d7..dee271d94a3 100644 --- a/tests/components/speedtestdotnet/test_config_flow.py +++ b/tests/components/speedtestdotnet/test_config_flow.py @@ -1,5 +1,6 @@ """Tests for SpeedTest config flow.""" from datetime import timedelta +from unittest.mock import patch import pytest from speedtest import NoMatchedServers @@ -17,7 +18,6 @@ from homeassistant.const import CONF_MONITORED_CONDITIONS, CONF_SCAN_INTERVAL from . import MOCK_SERVERS -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/speedtestdotnet/test_init.py b/tests/components/speedtestdotnet/test_init.py index cadf97fc761..72bcb743a8d 100644 --- a/tests/components/speedtestdotnet/test_init.py +++ b/tests/components/speedtestdotnet/test_init.py @@ -1,11 +1,12 @@ """Tests for SpeedTest integration.""" +from unittest.mock import patch + import speedtest from homeassistant import config_entries from homeassistant.components import speedtestdotnet from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/speedtestdotnet/test_sensor.py b/tests/components/speedtestdotnet/test_sensor.py index 5c1606f0f4b..c08a9f3304f 100644 --- a/tests/components/speedtestdotnet/test_sensor.py +++ b/tests/components/speedtestdotnet/test_sensor.py @@ -1,11 +1,12 @@ """Tests for SpeedTest sensors.""" +from unittest.mock import patch + from homeassistant.components import speedtestdotnet from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN from homeassistant.components.speedtestdotnet.const import DEFAULT_NAME, SENSOR_TYPES from . import MOCK_RESULTS, MOCK_SERVERS, MOCK_STATES -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/spider/test_config_flow.py b/tests/components/spider/test_config_flow.py index ca1b37434d1..e8d10b51cf3 100644 --- a/tests/components/spider/test_config_flow.py +++ b/tests/components/spider/test_config_flow.py @@ -1,11 +1,12 @@ """Tests for the Spider config flow.""" +from unittest.mock import Mock, patch + import pytest from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.spider.const import DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import Mock, patch from tests.common import MockConfigEntry USERNAME = "spider-username" diff --git a/tests/components/spotify/test_config_flow.py b/tests/components/spotify/test_config_flow.py index 53e87e5bdae..37a33ef66b2 100644 --- a/tests/components/spotify/test_config_flow.py +++ b/tests/components/spotify/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for the Spotify config flow.""" +from unittest.mock import patch + from spotipy import SpotifyException from homeassistant import data_entry_flow, setup @@ -7,7 +9,6 @@ from homeassistant.config_entries import SOURCE_USER, SOURCE_ZEROCONF from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET from homeassistant.helpers import config_entry_oauth2_flow -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/squeezebox/test_config_flow.py b/tests/components/squeezebox/test_config_flow.py index f325024cf00..2dae2f78d01 100644 --- a/tests/components/squeezebox/test_config_flow.py +++ b/tests/components/squeezebox/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Logitech Squeezebox config flow.""" +from unittest.mock import patch + from pysqueezebox import Server from homeassistant import config_entries @@ -16,7 +18,6 @@ from homeassistant.data_entry_flow import ( RESULT_TYPE_FORM, ) -from tests.async_mock import patch from tests.common import MockConfigEntry HOST = "1.1.1.1" diff --git a/tests/components/srp_energy/__init__.py b/tests/components/srp_energy/__init__.py index 34f06e2993e..5e2a4695d0b 100644 --- a/tests/components/srp_energy/__init__.py +++ b/tests/components/srp_energy/__init__.py @@ -1,9 +1,10 @@ """Tests for the SRP Energy integration.""" +from unittest.mock import patch + from homeassistant import config_entries from homeassistant.components import srp_energy from homeassistant.const import CONF_ID, CONF_NAME, CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry ENTRY_OPTIONS = {} diff --git a/tests/components/srp_energy/test_config_flow.py b/tests/components/srp_energy/test_config_flow.py index acb9d28f75d..adad1878326 100644 --- a/tests/components/srp_energy/test_config_flow.py +++ b/tests/components/srp_energy/test_config_flow.py @@ -1,11 +1,11 @@ """Test the SRP Energy config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, data_entry_flow from homeassistant.components.srp_energy.const import CONF_IS_TOU, SRP_ENERGY_DOMAIN from . import ENTRY_CONFIG, init_integration -from tests.async_mock import patch - async def test_form(hass): """Test user config.""" diff --git a/tests/components/srp_energy/test_sensor.py b/tests/components/srp_energy/test_sensor.py index 3a70a3ec09f..a93e56b7b93 100644 --- a/tests/components/srp_energy/test_sensor.py +++ b/tests/components/srp_energy/test_sensor.py @@ -1,4 +1,6 @@ """Tests for the srp_energy sensor platform.""" +from unittest.mock import MagicMock + from homeassistant.components.srp_energy.const import ( ATTRIBUTION, DEFAULT_NAME, @@ -10,8 +12,6 @@ from homeassistant.components.srp_energy.const import ( from homeassistant.components.srp_energy.sensor import SrpEntity, async_setup_entry from homeassistant.const import ATTR_ATTRIBUTION, ENERGY_KILO_WATT_HOUR -from tests.async_mock import MagicMock - async def test_async_setup_entry(hass): """Test the sensor.""" diff --git a/tests/components/statistics/test_sensor.py b/tests/components/statistics/test_sensor.py index 24401963974..b6bebcfeeda 100644 --- a/tests/components/statistics/test_sensor.py +++ b/tests/components/statistics/test_sensor.py @@ -3,6 +3,7 @@ from datetime import datetime, timedelta from os import path import statistics import unittest +from unittest.mock import patch import pytest @@ -18,7 +19,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component, setup_component from homeassistant.util import dt as dt_util -from tests.async_mock import patch from tests.common import ( fire_time_changed, get_test_home_assistant, diff --git a/tests/components/statsd/test_init.py b/tests/components/statsd/test_init.py index 30b52659685..17e49b09951 100644 --- a/tests/components/statsd/test_init.py +++ b/tests/components/statsd/test_init.py @@ -1,5 +1,6 @@ """The tests for the StatsD feeder.""" from unittest import mock +from unittest.mock import MagicMock, patch import pytest import voluptuous as vol @@ -9,8 +10,6 @@ from homeassistant.const import EVENT_STATE_CHANGED, STATE_OFF, STATE_ON import homeassistant.core as ha from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, patch - @pytest.fixture def mock_client(): diff --git a/tests/components/stream/test_hls.py b/tests/components/stream/test_hls.py index 16d2d724f22..3af48cb580d 100644 --- a/tests/components/stream/test_hls.py +++ b/tests/components/stream/test_hls.py @@ -1,5 +1,6 @@ """The tests for hls streams.""" from datetime import timedelta +from unittest.mock import patch from urllib.parse import urlparse import av @@ -10,7 +11,6 @@ from homeassistant.const import HTTP_NOT_FOUND from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import async_fire_time_changed from tests.components.stream.common import generate_h264_video, preload_stream diff --git a/tests/components/stream/test_init.py b/tests/components/stream/test_init.py index 505de7ca018..1515ff1a490 100644 --- a/tests/components/stream/test_init.py +++ b/tests/components/stream/test_init.py @@ -1,4 +1,6 @@ """The tests for stream.""" +from unittest.mock import AsyncMock, MagicMock, patch + import pytest from homeassistant.components.stream.const import ( @@ -12,8 +14,6 @@ from homeassistant.const import CONF_FILENAME from homeassistant.exceptions import HomeAssistantError from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock, MagicMock, patch - async def test_record_service_invalid_file(hass): """Test record service call with invalid file.""" diff --git a/tests/components/stream/test_recorder.py b/tests/components/stream/test_recorder.py index cb6a1c9d36f..220d0a062e3 100644 --- a/tests/components/stream/test_recorder.py +++ b/tests/components/stream/test_recorder.py @@ -1,6 +1,7 @@ """The tests for hls streams.""" from datetime import timedelta from io import BytesIO +from unittest.mock import patch import av import pytest @@ -10,7 +11,6 @@ from homeassistant.components.stream.recorder import recorder_save_worker from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import async_fire_time_changed from tests.components.stream.common import generate_h264_video, preload_stream diff --git a/tests/components/sun/test_init.py b/tests/components/sun/test_init.py index 36eaa8398ac..1e95082b358 100644 --- a/tests/components/sun/test_init.py +++ b/tests/components/sun/test_init.py @@ -1,5 +1,6 @@ """The tests for the Sun component.""" from datetime import datetime, timedelta +from unittest.mock import patch from pytest import mark @@ -9,8 +10,6 @@ import homeassistant.core as ha from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch - async def test_setting_rising(hass, legacy_patchable_time): """Test retrieving sun setting and rising.""" diff --git a/tests/components/sun/test_trigger.py b/tests/components/sun/test_trigger.py index 1a3de56964c..a288150517d 100644 --- a/tests/components/sun/test_trigger.py +++ b/tests/components/sun/test_trigger.py @@ -1,5 +1,6 @@ """The tests for the sun automation.""" from datetime import datetime +from unittest.mock import patch import pytest @@ -16,7 +17,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import async_fire_time_changed, async_mock_service, mock_component from tests.components.blueprint.conftest import stub_blueprint_populate # noqa diff --git a/tests/components/surepetcare/__init__.py b/tests/components/surepetcare/__init__.py index a7ce6d3b6a6..d4af323d063 100644 --- a/tests/components/surepetcare/__init__.py +++ b/tests/components/surepetcare/__init__.py @@ -1,9 +1,9 @@ """Tests for Sure Petcare integration.""" +from unittest.mock import patch + from homeassistant.components.surepetcare.const import DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import patch - HOUSEHOLD_ID = "household-id" HUB_ID = "hub-id" diff --git a/tests/components/surepetcare/conftest.py b/tests/components/surepetcare/conftest.py index ed42fe2532b..9bc06a84267 100644 --- a/tests/components/surepetcare/conftest.py +++ b/tests/components/surepetcare/conftest.py @@ -1,11 +1,11 @@ """Define fixtures available for all tests.""" +from unittest.mock import AsyncMock, patch + from pytest import fixture from surepy import SurePetcare from homeassistant.helpers.aiohttp_client import async_get_clientsession -from tests.async_mock import AsyncMock, patch - @fixture async def surepetcare(hass): diff --git a/tests/components/switch/test_device_condition.py b/tests/components/switch/test_device_condition.py index 093758cbe62..67ba3e8e38e 100644 --- a/tests/components/switch/test_device_condition.py +++ b/tests/components/switch/test_device_condition.py @@ -1,5 +1,6 @@ """The test for switch device automation.""" from datetime import timedelta +from unittest.mock import patch import pytest @@ -10,7 +11,6 @@ from homeassistant.helpers import device_registry from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import ( MockConfigEntry, async_get_device_automation_capabilities, diff --git a/tests/components/switcher_kis/conftest.py b/tests/components/switcher_kis/conftest.py index 37d61d6ca19..a95dd2fd6d1 100644 --- a/tests/components/switcher_kis/conftest.py +++ b/tests/components/switcher_kis/conftest.py @@ -3,6 +3,7 @@ from asyncio import Queue from datetime import datetime from typing import Any, Generator, Optional +from unittest.mock import AsyncMock, patch from pytest import fixture @@ -19,8 +20,6 @@ from .consts import ( DUMMY_REMAINING_TIME, ) -from tests.async_mock import AsyncMock, patch - @patch("aioswitcher.devices.SwitcherV2Device") class MockSwitcherV2Device: diff --git a/tests/components/syncthru/test_config_flow.py b/tests/components/syncthru/test_config_flow.py index 1df377ff0e8..70e8a80ad0f 100644 --- a/tests/components/syncthru/test_config_flow.py +++ b/tests/components/syncthru/test_config_flow.py @@ -1,6 +1,7 @@ """Tests for syncthru config flow.""" import re +from unittest.mock import patch from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components import ssdp @@ -8,7 +9,6 @@ from homeassistant.components.syncthru.config_flow import SyncThru from homeassistant.components.syncthru.const import DOMAIN from homeassistant.const import CONF_NAME, CONF_URL -from tests.async_mock import patch from tests.common import MockConfigEntry, mock_coro FIXTURE_USER_INPUT = { diff --git a/tests/components/synology_dsm/conftest.py b/tests/components/synology_dsm/conftest.py index db25bd59ada..74de072e229 100644 --- a/tests/components/synology_dsm/conftest.py +++ b/tests/components/synology_dsm/conftest.py @@ -1,7 +1,7 @@ """Configure Synology DSM tests.""" -import pytest +from unittest.mock import patch -from tests.async_mock import patch +import pytest def pytest_configure(config): diff --git a/tests/components/synology_dsm/test_config_flow.py b/tests/components/synology_dsm/test_config_flow.py index 59ed8eea657..85ed02a7a52 100644 --- a/tests/components/synology_dsm/test_config_flow.py +++ b/tests/components/synology_dsm/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for the Synology DSM config flow.""" +from unittest.mock import MagicMock, Mock, patch + import pytest from synology_dsm.exceptions import ( SynologyDSMException, @@ -50,7 +52,6 @@ from .consts import ( VERIFY_SSL, ) -from tests.async_mock import MagicMock, Mock, patch from tests.common import MockConfigEntry diff --git a/tests/components/synology_dsm/test_init.py b/tests/components/synology_dsm/test_init.py index b8be375b321..59864c56523 100644 --- a/tests/components/synology_dsm/test_init.py +++ b/tests/components/synology_dsm/test_init.py @@ -1,4 +1,6 @@ """Tests for the Synology DSM component.""" +from unittest.mock import patch + import pytest from homeassistant.components.synology_dsm.const import DOMAIN, SERVICES @@ -14,7 +16,6 @@ from homeassistant.helpers.typing import HomeAssistantType from .consts import HOST, MACS, PASSWORD, PORT, USE_SSL, USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/system_health/test_init.py b/tests/components/system_health/test_init.py index 28f54c81c42..212ec544629 100644 --- a/tests/components/system_health/test_init.py +++ b/tests/components/system_health/test_init.py @@ -1,12 +1,12 @@ """Tests for the system health component init.""" import asyncio +from unittest.mock import AsyncMock, Mock, patch from aiohttp.client_exceptions import ClientError from homeassistant.components import system_health from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock, Mock, patch from tests.common import get_system_health_info, mock_platform diff --git a/tests/components/system_log/test_init.py b/tests/components/system_log/test_init.py index 85e86d9c78f..287e7139aff 100644 --- a/tests/components/system_log/test_init.py +++ b/tests/components/system_log/test_init.py @@ -2,6 +2,7 @@ import asyncio import logging import queue +from unittest.mock import MagicMock, patch import pytest @@ -9,8 +10,6 @@ from homeassistant.bootstrap import async_setup_component from homeassistant.components import system_log from homeassistant.core import callback -from tests.async_mock import MagicMock, patch - _LOGGER = logging.getLogger("test_logger") BASIC_CONFIG = {"system_log": {"max_entries": 2}} diff --git a/tests/components/tado/test_config_flow.py b/tests/components/tado/test_config_flow.py index ce4af05b79c..1b0fcc268d6 100644 --- a/tests/components/tado/test_config_flow.py +++ b/tests/components/tado/test_config_flow.py @@ -1,11 +1,12 @@ """Test the Tado config flow.""" +from unittest.mock import MagicMock, patch + import requests from homeassistant import config_entries, setup from homeassistant.components.tado.const import DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry diff --git a/tests/components/tag/test_init.py b/tests/components/tag/test_init.py index 442d3263f0a..2f9ff2310cf 100644 --- a/tests/components/tag/test_init.py +++ b/tests/components/tag/test_init.py @@ -1,4 +1,6 @@ """Tests for the tag component.""" +from unittest.mock import patch + import pytest from homeassistant.components.tag import DOMAIN, TAGS, async_scan_tag @@ -6,8 +8,6 @@ from homeassistant.helpers import collection from homeassistant.setup import async_setup_component from homeassistant.util import dt as dt_util -from tests.async_mock import patch - @pytest.fixture def storage_setup(hass, hass_storage): diff --git a/tests/components/tasmota/conftest.py b/tests/components/tasmota/conftest.py index fadf8a44648..3c530a93d1e 100644 --- a/tests/components/tasmota/conftest.py +++ b/tests/components/tasmota/conftest.py @@ -1,4 +1,6 @@ """Test fixtures for Tasmota component.""" +from unittest.mock import patch + from hatasmota.discovery import get_status_sensor_entities import pytest @@ -9,7 +11,6 @@ from homeassistant.components.tasmota.const import ( DOMAIN, ) -from tests.async_mock import patch from tests.common import ( MockConfigEntry, async_mock_service, diff --git a/tests/components/tasmota/test_binary_sensor.py b/tests/components/tasmota/test_binary_sensor.py index 3f444e75bdc..6d4263853dc 100644 --- a/tests/components/tasmota/test_binary_sensor.py +++ b/tests/components/tasmota/test_binary_sensor.py @@ -2,6 +2,7 @@ import copy from datetime import timedelta import json +from unittest.mock import patch from hatasmota.utils import ( get_topic_stat_result, @@ -34,7 +35,6 @@ from .test_common import ( help_test_entity_id_update_subscriptions, ) -from tests.async_mock import patch from tests.common import async_fire_mqtt_message, async_fire_time_changed diff --git a/tests/components/tasmota/test_common.py b/tests/components/tasmota/test_common.py index 04346f915c4..973ecd3c890 100644 --- a/tests/components/tasmota/test_common.py +++ b/tests/components/tasmota/test_common.py @@ -1,6 +1,7 @@ """Common test objects.""" import copy import json +from unittest.mock import ANY from hatasmota.const import ( CONF_MAC, @@ -20,7 +21,6 @@ from hatasmota.utils import ( from homeassistant.components.tasmota.const import DEFAULT_PREFIX from homeassistant.const import STATE_UNAVAILABLE -from tests.async_mock import ANY from tests.common import async_fire_mqtt_message DEFAULT_CONFIG = { diff --git a/tests/components/tasmota/test_cover.py b/tests/components/tasmota/test_cover.py index d5ae01f1666..131f95842a5 100644 --- a/tests/components/tasmota/test_cover.py +++ b/tests/components/tasmota/test_cover.py @@ -1,6 +1,7 @@ """The tests for the Tasmota cover platform.""" import copy import json +from unittest.mock import patch from hatasmota.utils import ( get_topic_stat_result, @@ -26,7 +27,6 @@ from .test_common import ( help_test_entity_id_update_subscriptions, ) -from tests.async_mock import patch from tests.common import async_fire_mqtt_message diff --git a/tests/components/tasmota/test_device_trigger.py b/tests/components/tasmota/test_device_trigger.py index 2c88533f30d..ec8744881c5 100644 --- a/tests/components/tasmota/test_device_trigger.py +++ b/tests/components/tasmota/test_device_trigger.py @@ -1,6 +1,7 @@ """The tests for MQTT device triggers.""" import copy import json +from unittest.mock import patch from hatasmota.switch import TasmotaSwitchTriggerConfig import pytest @@ -12,7 +13,6 @@ from homeassistant.setup import async_setup_component from .test_common import DEFAULT_CONFIG -from tests.async_mock import patch from tests.common import ( assert_lists_same, async_fire_mqtt_message, diff --git a/tests/components/tasmota/test_discovery.py b/tests/components/tasmota/test_discovery.py index 40fecb6b695..35be7e50e62 100644 --- a/tests/components/tasmota/test_discovery.py +++ b/tests/components/tasmota/test_discovery.py @@ -1,6 +1,7 @@ """The tests for the MQTT discovery.""" import copy import json +from unittest.mock import patch from homeassistant.components.tasmota.const import DEFAULT_PREFIX from homeassistant.components.tasmota.discovery import ALREADY_DISCOVERED @@ -8,7 +9,6 @@ from homeassistant.components.tasmota.discovery import ALREADY_DISCOVERED from .conftest import setup_tasmota_helper from .test_common import DEFAULT_CONFIG, DEFAULT_CONFIG_9_0_0_3 -from tests.async_mock import patch from tests.common import async_fire_mqtt_message diff --git a/tests/components/tasmota/test_fan.py b/tests/components/tasmota/test_fan.py index 1aca8c84e07..4035c877bb8 100644 --- a/tests/components/tasmota/test_fan.py +++ b/tests/components/tasmota/test_fan.py @@ -1,6 +1,7 @@ """The tests for the Tasmota fan platform.""" import copy import json +from unittest.mock import patch from hatasmota.utils import ( get_topic_stat_result, @@ -26,7 +27,6 @@ from .test_common import ( help_test_entity_id_update_subscriptions, ) -from tests.async_mock import patch from tests.common import async_fire_mqtt_message from tests.components.fan import common diff --git a/tests/components/tasmota/test_init.py b/tests/components/tasmota/test_init.py index 39d99872741..5b553164583 100644 --- a/tests/components/tasmota/test_init.py +++ b/tests/components/tasmota/test_init.py @@ -1,13 +1,13 @@ """The tests for the Tasmota binary sensor platform.""" import copy import json +from unittest.mock import call from homeassistant.components import websocket_api from homeassistant.components.tasmota.const import DEFAULT_PREFIX from .test_common import DEFAULT_CONFIG -from tests.async_mock import call from tests.common import MockConfigEntry, async_fire_mqtt_message diff --git a/tests/components/tasmota/test_light.py b/tests/components/tasmota/test_light.py index f09c27da753..d04b9dcf02b 100644 --- a/tests/components/tasmota/test_light.py +++ b/tests/components/tasmota/test_light.py @@ -1,6 +1,7 @@ """The tests for the Tasmota light platform.""" import copy import json +from unittest.mock import patch from hatasmota.const import CONF_MAC from hatasmota.utils import ( @@ -34,7 +35,6 @@ from .test_common import ( help_test_entity_id_update_subscriptions, ) -from tests.async_mock import patch from tests.common import async_fire_mqtt_message from tests.components.light import common diff --git a/tests/components/tasmota/test_mixins.py b/tests/components/tasmota/test_mixins.py index 5f4ef443475..579f8e9aaeb 100644 --- a/tests/components/tasmota/test_mixins.py +++ b/tests/components/tasmota/test_mixins.py @@ -1,6 +1,7 @@ """The tests for the Tasmota mixins.""" import copy import json +from unittest.mock import call from hatasmota.const import CONF_MAC from hatasmota.utils import config_get_state_online, get_topic_tele_will @@ -9,7 +10,6 @@ from homeassistant.components.tasmota.const import DEFAULT_PREFIX from .test_common import DEFAULT_CONFIG -from tests.async_mock import call from tests.common import async_fire_mqtt_message diff --git a/tests/components/tasmota/test_sensor.py b/tests/components/tasmota/test_sensor.py index 4c8de9e339d..fe415c264ef 100644 --- a/tests/components/tasmota/test_sensor.py +++ b/tests/components/tasmota/test_sensor.py @@ -3,6 +3,7 @@ import copy import datetime from datetime import timedelta import json +from unittest.mock import Mock, patch import hatasmota from hatasmota.utils import ( @@ -31,7 +32,6 @@ from .test_common import ( help_test_entity_id_update_subscriptions, ) -from tests.async_mock import Mock, patch from tests.common import async_fire_mqtt_message, async_fire_time_changed DEFAULT_SENSOR_CONFIG = { diff --git a/tests/components/tasmota/test_switch.py b/tests/components/tasmota/test_switch.py index 208026c2de5..00b0a922e0a 100644 --- a/tests/components/tasmota/test_switch.py +++ b/tests/components/tasmota/test_switch.py @@ -1,6 +1,7 @@ """The tests for the Tasmota switch platform.""" import copy import json +from unittest.mock import patch from hatasmota.utils import ( get_topic_stat_result, @@ -25,7 +26,6 @@ from .test_common import ( help_test_entity_id_update_subscriptions, ) -from tests.async_mock import patch from tests.common import async_fire_mqtt_message from tests.components.switch import common diff --git a/tests/components/tcp/test_binary_sensor.py b/tests/components/tcp/test_binary_sensor.py index 4cde4d9ac31..2dc16ad79c7 100644 --- a/tests/components/tcp/test_binary_sensor.py +++ b/tests/components/tcp/test_binary_sensor.py @@ -1,11 +1,11 @@ """The tests for the TCP binary sensor platform.""" import unittest +from unittest.mock import Mock, patch from homeassistant.components.tcp import binary_sensor as bin_tcp import homeassistant.components.tcp.sensor as tcp from homeassistant.setup import setup_component -from tests.async_mock import Mock, patch from tests.common import assert_setup_component, get_test_home_assistant import tests.components.tcp.test_sensor as test_tcp diff --git a/tests/components/tcp/test_sensor.py b/tests/components/tcp/test_sensor.py index b06652dc53f..8e79d4e514d 100644 --- a/tests/components/tcp/test_sensor.py +++ b/tests/components/tcp/test_sensor.py @@ -2,6 +2,7 @@ from copy import copy import socket import unittest +from unittest.mock import Mock, patch from uuid import uuid4 import homeassistant.components.tcp.sensor as tcp @@ -9,7 +10,6 @@ from homeassistant.helpers.entity import Entity from homeassistant.helpers.template import Template from homeassistant.setup import setup_component -from tests.async_mock import Mock, patch from tests.common import assert_setup_component, get_test_home_assistant TEST_CONFIG = { diff --git a/tests/components/telegram/test_notify.py b/tests/components/telegram/test_notify.py index 7488db49d9e..6f8d1f989f9 100644 --- a/tests/components/telegram/test_notify.py +++ b/tests/components/telegram/test_notify.py @@ -1,5 +1,6 @@ """The tests for the telegram.notify platform.""" from os import path +from unittest.mock import patch from homeassistant import config as hass_config import homeassistant.components.notify as notify @@ -7,8 +8,6 @@ from homeassistant.components.telegram import DOMAIN from homeassistant.const import SERVICE_RELOAD from homeassistant.setup import async_setup_component -from tests.async_mock import patch - async def test_reload_notify(hass): """Verify we can reload the notify service.""" diff --git a/tests/components/template/test_binary_sensor.py b/tests/components/template/test_binary_sensor.py index e8ff4c83f8d..241ac88328e 100644 --- a/tests/components/template/test_binary_sensor.py +++ b/tests/components/template/test_binary_sensor.py @@ -1,6 +1,7 @@ """The tests for the Template Binary sensor platform.""" from datetime import timedelta import logging +from unittest.mock import patch from homeassistant import setup from homeassistant.components import binary_sensor @@ -14,7 +15,6 @@ from homeassistant.const import ( from homeassistant.core import CoreState import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import assert_setup_component, async_fire_time_changed diff --git a/tests/components/template/test_sensor.py b/tests/components/template/test_sensor.py index c39fb474bca..7f560fa0abb 100644 --- a/tests/components/template/test_sensor.py +++ b/tests/components/template/test_sensor.py @@ -1,6 +1,7 @@ """The test for the Template sensor platform.""" from asyncio import Event from datetime import timedelta +from unittest.mock import patch from homeassistant.bootstrap import async_from_config_dict from homeassistant.components import sensor @@ -18,7 +19,6 @@ from homeassistant.helpers.template import Template from homeassistant.setup import ATTR_COMPONENT, async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import assert_setup_component, async_fire_time_changed diff --git a/tests/components/template/test_trigger.py b/tests/components/template/test_trigger.py index 822a274bf23..de4974cb1b6 100644 --- a/tests/components/template/test_trigger.py +++ b/tests/components/template/test_trigger.py @@ -1,6 +1,7 @@ """The tests for the Template automation.""" from datetime import timedelta from unittest import mock +from unittest.mock import patch import pytest @@ -11,7 +12,6 @@ from homeassistant.core import Context, callback from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import ( assert_setup_component, async_fire_time_changed, diff --git a/tests/components/tesla/test_config_flow.py b/tests/components/tesla/test_config_flow.py index 59cdf910bf4..7fb308ecc43 100644 --- a/tests/components/tesla/test_config_flow.py +++ b/tests/components/tesla/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Tesla config flow.""" +from unittest.mock import patch + from teslajsonpy import TeslaException from homeassistant import config_entries, data_entry_flow, setup @@ -18,7 +20,6 @@ from homeassistant.const import ( HTTP_NOT_FOUND, ) -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/tibber/test_config_flow.py b/tests/components/tibber/test_config_flow.py index c92ec5bc5c7..479f314123a 100644 --- a/tests/components/tibber/test_config_flow.py +++ b/tests/components/tibber/test_config_flow.py @@ -1,10 +1,11 @@ """Tests for Tibber config flow.""" +from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch + import pytest from homeassistant.components.tibber.const import DOMAIN from homeassistant.const import CONF_ACCESS_TOKEN -from tests.async_mock import AsyncMock, MagicMock, PropertyMock, patch from tests.common import MockConfigEntry diff --git a/tests/components/tile/test_config_flow.py b/tests/components/tile/test_config_flow.py index b9d4799dc2f..e5561133a35 100644 --- a/tests/components/tile/test_config_flow.py +++ b/tests/components/tile/test_config_flow.py @@ -1,4 +1,6 @@ """Define tests for the Tile config flow.""" +from unittest.mock import patch + from pytile.errors import TileError from homeassistant import data_entry_flow @@ -6,7 +8,6 @@ from homeassistant.components.tile import DOMAIN from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/time_date/test_sensor.py b/tests/components/time_date/test_sensor.py index b502dad3ea6..a9b5ea83c05 100644 --- a/tests/components/time_date/test_sensor.py +++ b/tests/components/time_date/test_sensor.py @@ -1,11 +1,11 @@ """The tests for time_date sensor platform.""" +from unittest.mock import patch + import pytest import homeassistant.components.time_date.sensor as time_date import homeassistant.util.dt as dt_util -from tests.async_mock import patch - ORIG_TZ = dt_util.DEFAULT_TIME_ZONE diff --git a/tests/components/timer/test_init.py b/tests/components/timer/test_init.py index 6b5a2596b71..74c3eceeea2 100644 --- a/tests/components/timer/test_init.py +++ b/tests/components/timer/test_init.py @@ -2,6 +2,7 @@ # pylint: disable=protected-access from datetime import timedelta import logging +from unittest.mock import patch import pytest @@ -42,7 +43,6 @@ from homeassistant.helpers import config_validation as cv, entity_registry from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow -from tests.async_mock import patch from tests.common import async_fire_time_changed _LOGGER = logging.getLogger(__name__) diff --git a/tests/components/tod/test_binary_sensor.py b/tests/components/tod/test_binary_sensor.py index b0bca3e1c01..dff1e208ab6 100644 --- a/tests/components/tod/test_binary_sensor.py +++ b/tests/components/tod/test_binary_sensor.py @@ -1,5 +1,6 @@ """Test Times of the Day Binary Sensor.""" from datetime import datetime, timedelta +from unittest.mock import patch import pytest import pytz @@ -10,7 +11,6 @@ from homeassistant.helpers.sun import get_astral_event_date, get_astral_event_ne from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import assert_setup_component diff --git a/tests/components/toon/test_config_flow.py b/tests/components/toon/test_config_flow.py index b7eb3898b47..f3240991a37 100644 --- a/tests/components/toon/test_config_flow.py +++ b/tests/components/toon/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for the Toon config flow.""" +from unittest.mock import patch + from toonapi import Agreement, ToonError from homeassistant import data_entry_flow @@ -9,7 +11,6 @@ from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET from homeassistant.helpers import config_entry_oauth2_flow from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/totalconnect/common.py b/tests/components/totalconnect/common.py index c2d6f92015c..17fa244f9b2 100644 --- a/tests/components/totalconnect/common.py +++ b/tests/components/totalconnect/common.py @@ -1,11 +1,12 @@ """Common methods used across tests for TotalConnect.""" +from unittest.mock import patch + from total_connect_client import TotalConnectClient from homeassistant.components.totalconnect import DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_USERNAME from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import MockConfigEntry LOCATION_INFO_BASIC_NORMAL = { diff --git a/tests/components/totalconnect/test_alarm_control_panel.py b/tests/components/totalconnect/test_alarm_control_panel.py index 75e07f09bf7..bc90c1aae2a 100644 --- a/tests/components/totalconnect/test_alarm_control_panel.py +++ b/tests/components/totalconnect/test_alarm_control_panel.py @@ -1,4 +1,6 @@ """Tests for the TotalConnect alarm control panel device.""" +from unittest.mock import patch + import pytest from homeassistant.components.alarm_control_panel import DOMAIN as ALARM_DOMAIN @@ -24,8 +26,6 @@ from .common import ( setup_platform, ) -from tests.async_mock import patch - ENTITY_ID = "alarm_control_panel.test" CODE = "-1" DATA = {ATTR_ENTITY_ID: ENTITY_ID} diff --git a/tests/components/totalconnect/test_config_flow.py b/tests/components/totalconnect/test_config_flow.py index fd8cdcc5116..a1aa8780cfb 100644 --- a/tests/components/totalconnect/test_config_flow.py +++ b/tests/components/totalconnect/test_config_flow.py @@ -1,10 +1,11 @@ """Tests for the iCloud config flow.""" +from unittest.mock import patch + from homeassistant import data_entry_flow from homeassistant.components.totalconnect.const import DOMAIN from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry USERNAME = "username@me.com" diff --git a/tests/components/tplink/test_light.py b/tests/components/tplink/test_light.py index 48812f8fb2b..4c34e754ec3 100644 --- a/tests/components/tplink/test_light.py +++ b/tests/components/tplink/test_light.py @@ -2,6 +2,7 @@ from datetime import timedelta import logging from typing import Callable, NamedTuple +from unittest.mock import Mock, PropertyMock, patch from pyHS100 import SmartDeviceException import pytest @@ -33,7 +34,6 @@ from homeassistant.core import HomeAssistant from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow -from tests.async_mock import Mock, PropertyMock, patch from tests.common import async_fire_time_changed diff --git a/tests/components/traccar/test_init.py b/tests/components/traccar/test_init.py index 12e1ff5562a..c7e031b2ca6 100644 --- a/tests/components/traccar/test_init.py +++ b/tests/components/traccar/test_init.py @@ -1,4 +1,6 @@ """The tests the for Traccar device tracker platform.""" +from unittest.mock import patch + import pytest from homeassistant import data_entry_flow @@ -15,8 +17,6 @@ from homeassistant.const import ( from homeassistant.helpers.dispatcher import DATA_DISPATCHER from homeassistant.setup import async_setup_component -from tests.async_mock import patch - HOME_LATITUDE = 37.239622 HOME_LONGITUDE = -115.815811 diff --git a/tests/components/tradfri/conftest.py b/tests/components/tradfri/conftest.py index c95bf2c036c..93675a9e4d1 100644 --- a/tests/components/tradfri/conftest.py +++ b/tests/components/tradfri/conftest.py @@ -1,9 +1,10 @@ """Common tradfri test fixtures.""" +from unittest.mock import Mock, patch + import pytest from . import MOCK_GATEWAY_ID -from tests.async_mock import Mock, patch from tests.components.light.conftest import mock_light_profiles # noqa # pylint: disable=protected-access diff --git a/tests/components/tradfri/test_config_flow.py b/tests/components/tradfri/test_config_flow.py index c9f72b7a9df..a155e8b383c 100644 --- a/tests/components/tradfri/test_config_flow.py +++ b/tests/components/tradfri/test_config_flow.py @@ -1,10 +1,11 @@ """Test the Tradfri config flow.""" +from unittest.mock import patch + import pytest from homeassistant import data_entry_flow from homeassistant.components.tradfri import config_flow -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/tradfri/test_init.py b/tests/components/tradfri/test_init.py index 34cc6d38091..0983b5aa22f 100644 --- a/tests/components/tradfri/test_init.py +++ b/tests/components/tradfri/test_init.py @@ -1,4 +1,6 @@ """Tests for Tradfri setup.""" +from unittest.mock import patch + from homeassistant.components import tradfri from homeassistant.helpers.device_registry import ( async_entries_for_config_entry, @@ -6,7 +8,6 @@ from homeassistant.helpers.device_registry import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/tradfri/test_light.py b/tests/components/tradfri/test_light.py index cf11d42411e..a4a1006d7fe 100644 --- a/tests/components/tradfri/test_light.py +++ b/tests/components/tradfri/test_light.py @@ -1,6 +1,7 @@ """Tradfri lights platform tests.""" from copy import deepcopy +from unittest.mock import MagicMock, Mock, PropertyMock, patch import pytest from pytradfri.device import Device @@ -11,7 +12,6 @@ from homeassistant.components import tradfri from . import MOCK_GATEWAY_ID -from tests.async_mock import MagicMock, Mock, PropertyMock, patch from tests.common import MockConfigEntry DEFAULT_TEST_FEATURES = { diff --git a/tests/components/transmission/test_config_flow.py b/tests/components/transmission/test_config_flow.py index 0b57ab59913..2982d363da9 100644 --- a/tests/components/transmission/test_config_flow.py +++ b/tests/components/transmission/test_config_flow.py @@ -1,5 +1,6 @@ """Tests for Transmission config flow.""" from datetime import timedelta +from unittest.mock import patch import pytest from transmissionrpc.error import TransmissionError @@ -25,7 +26,6 @@ from homeassistant.const import ( CONF_USERNAME, ) -from tests.async_mock import patch from tests.common import MockConfigEntry NAME = "Transmission" diff --git a/tests/components/transport_nsw/test_sensor.py b/tests/components/transport_nsw/test_sensor.py index a6f9c7dfd7f..baf7f793426 100644 --- a/tests/components/transport_nsw/test_sensor.py +++ b/tests/components/transport_nsw/test_sensor.py @@ -1,7 +1,7 @@ """The tests for the Transport NSW (AU) sensor platform.""" -from homeassistant.setup import async_setup_component +from unittest.mock import patch -from tests.async_mock import patch +from homeassistant.setup import async_setup_component VALID_CONFIG = { "sensor": { diff --git a/tests/components/trend/test_binary_sensor.py b/tests/components/trend/test_binary_sensor.py index 43db97b8f80..d1d77001bff 100644 --- a/tests/components/trend/test_binary_sensor.py +++ b/tests/components/trend/test_binary_sensor.py @@ -1,13 +1,13 @@ """The test for the Trend sensor platform.""" from datetime import timedelta from os import path +from unittest.mock import patch from homeassistant import config as hass_config, setup from homeassistant.components.trend import DOMAIN from homeassistant.const import SERVICE_RELOAD import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import assert_setup_component, get_test_home_assistant diff --git a/tests/components/tts/test_init.py b/tests/components/tts/test_init.py index d66efec8c64..61d77b6c8e2 100644 --- a/tests/components/tts/test_init.py +++ b/tests/components/tts/test_init.py @@ -1,4 +1,6 @@ """The tests for the TTS component.""" +from unittest.mock import PropertyMock, patch + import pytest import yarl @@ -16,7 +18,6 @@ from homeassistant.config import async_process_ha_core_config from homeassistant.const import HTTP_NOT_FOUND from homeassistant.setup import async_setup_component -from tests.async_mock import PropertyMock, patch from tests.common import assert_setup_component, async_mock_service diff --git a/tests/components/tts/test_notify.py b/tests/components/tts/test_notify.py index 90c0175831f..9989b1d349e 100644 --- a/tests/components/tts/test_notify.py +++ b/tests/components/tts/test_notify.py @@ -1,4 +1,6 @@ """The tests for the TTS component.""" +from unittest.mock import patch + import pytest import yarl @@ -12,7 +14,6 @@ import homeassistant.components.tts as tts from homeassistant.config import async_process_ha_core_config from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import assert_setup_component, async_mock_service diff --git a/tests/components/tuya/test_config_flow.py b/tests/components/tuya/test_config_flow.py index e1b9bd3466c..0055b451e1a 100644 --- a/tests/components/tuya/test_config_flow.py +++ b/tests/components/tuya/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for the Tuya config flow.""" +from unittest.mock import Mock, patch + import pytest from tuyaha.tuyaapi import TuyaAPIException, TuyaNetException @@ -6,7 +8,6 @@ from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.tuya.const import CONF_COUNTRYCODE, DOMAIN from homeassistant.const import CONF_PASSWORD, CONF_PLATFORM, CONF_USERNAME -from tests.async_mock import Mock, patch from tests.common import MockConfigEntry USERNAME = "myUsername" diff --git a/tests/components/twilio/test_init.py b/tests/components/twilio/test_init.py index 185139077df..ee7f072a65c 100644 --- a/tests/components/twilio/test_init.py +++ b/tests/components/twilio/test_init.py @@ -1,10 +1,10 @@ """Test the init file of Twilio.""" +from unittest.mock import patch + from homeassistant import data_entry_flow from homeassistant.components import twilio from homeassistant.core import callback -from tests.async_mock import patch - async def test_config_flow_registers_webhook(hass, aiohttp_client): """Test setting up Twilio and sending webhook.""" diff --git a/tests/components/twinkly/test_config_flow.py b/tests/components/twinkly/test_config_flow.py index d1a56277fa7..afbe608219f 100644 --- a/tests/components/twinkly/test_config_flow.py +++ b/tests/components/twinkly/test_config_flow.py @@ -1,5 +1,7 @@ """Tests for the config_flow of the twinly component.""" +from unittest.mock import patch + from homeassistant import config_entries from homeassistant.components.twinkly.const import ( CONF_ENTRY_HOST, @@ -9,7 +11,6 @@ from homeassistant.components.twinkly.const import ( DOMAIN as TWINKLY_DOMAIN, ) -from tests.async_mock import patch from tests.components.twinkly import TEST_MODEL, ClientMock diff --git a/tests/components/twinkly/test_init.py b/tests/components/twinkly/test_init.py index d9dc4623d5e..3f55d2ffdf0 100644 --- a/tests/components/twinkly/test_init.py +++ b/tests/components/twinkly/test_init.py @@ -1,5 +1,6 @@ """Tests of the initialization of the twinly integration.""" +from unittest.mock import patch from uuid import uuid4 from homeassistant.components.twinkly import async_setup_entry, async_unload_entry @@ -12,7 +13,6 @@ from homeassistant.components.twinkly.const import ( ) from homeassistant.core import HomeAssistant -from tests.async_mock import patch from tests.common import MockConfigEntry from tests.components.twinkly import TEST_HOST, TEST_MODEL, TEST_NAME_ORIGINAL diff --git a/tests/components/twinkly/test_twinkly.py b/tests/components/twinkly/test_twinkly.py index 7f73589512a..7b7b44ee516 100644 --- a/tests/components/twinkly/test_twinkly.py +++ b/tests/components/twinkly/test_twinkly.py @@ -1,6 +1,7 @@ """Tests for the integration of a twinly device.""" from typing import Tuple +from unittest.mock import patch from homeassistant.components.twinkly.const import ( CONF_ENTRY_HOST, @@ -14,7 +15,6 @@ from homeassistant.core import HomeAssistant from homeassistant.helpers.device_registry import DeviceEntry from homeassistant.helpers.entity_registry import RegistryEntry -from tests.async_mock import patch from tests.common import MockConfigEntry from tests.components.twinkly import ( TEST_HOST, diff --git a/tests/components/twitch/test_twitch.py b/tests/components/twitch/test_twitch.py index 33afde2a076..310be91c796 100644 --- a/tests/components/twitch/test_twitch.py +++ b/tests/components/twitch/test_twitch.py @@ -1,4 +1,6 @@ """The tests for an update of the Twitch component.""" +from unittest.mock import MagicMock, patch + from requests import HTTPError from twitch.resources import Channel, Follow, Stream, Subscription, User @@ -6,8 +8,6 @@ from homeassistant.components import sensor from homeassistant.const import CONF_CLIENT_ID from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, patch - ENTITY_ID = "sensor.channel123" CONFIG = { sensor.DOMAIN: { diff --git a/tests/components/uk_transport/test_sensor.py b/tests/components/uk_transport/test_sensor.py index ff6cf3d1142..54bc122aa56 100644 --- a/tests/components/uk_transport/test_sensor.py +++ b/tests/components/uk_transport/test_sensor.py @@ -1,5 +1,6 @@ """The tests for the uk_transport platform.""" import re +from unittest.mock import patch import requests_mock @@ -18,7 +19,6 @@ from homeassistant.components.uk_transport.sensor import ( from homeassistant.setup import async_setup_component from homeassistant.util.dt import now -from tests.async_mock import patch from tests.common import load_fixture BUS_ATCOCODE = "340000368SHE" diff --git a/tests/components/unifi/conftest.py b/tests/components/unifi/conftest.py index 8ce7cef0345..b0491a9fa2a 100644 --- a/tests/components/unifi/conftest.py +++ b/tests/components/unifi/conftest.py @@ -1,7 +1,7 @@ """Fixtures for UniFi methods.""" -import pytest +from unittest.mock import patch -from tests.async_mock import patch +import pytest @pytest.fixture(autouse=True) diff --git a/tests/components/unifi/test_config_flow.py b/tests/components/unifi/test_config_flow.py index 87233f9983c..c57024dc758 100644 --- a/tests/components/unifi/test_config_flow.py +++ b/tests/components/unifi/test_config_flow.py @@ -1,4 +1,6 @@ """Test UniFi config flow.""" +from unittest.mock import patch + import aiounifi from homeassistant import data_entry_flow @@ -29,7 +31,6 @@ from homeassistant.const import ( from .test_controller import setup_unifi_integration -from tests.async_mock import patch from tests.common import MockConfigEntry CLIENTS = [{"mac": "00:00:00:00:00:01"}] diff --git a/tests/components/unifi/test_controller.py b/tests/components/unifi/test_controller.py index 8d5cb85bf9f..8105b88a6bf 100644 --- a/tests/components/unifi/test_controller.py +++ b/tests/components/unifi/test_controller.py @@ -2,6 +2,7 @@ from collections import deque from copy import deepcopy from datetime import timedelta +from unittest.mock import patch import aiounifi import pytest @@ -35,7 +36,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import MockConfigEntry CONTROLLER_HOST = { diff --git a/tests/components/unifi/test_init.py b/tests/components/unifi/test_init.py index 80e3e07fa17..cc2a4b3e4a3 100644 --- a/tests/components/unifi/test_init.py +++ b/tests/components/unifi/test_init.py @@ -1,5 +1,5 @@ """Test UniFi setup process.""" -from unittest.mock import Mock, patch +from unittest.mock import AsyncMock, Mock, patch from homeassistant.components import unifi from homeassistant.components.unifi.const import DOMAIN as UNIFI_DOMAIN @@ -7,7 +7,6 @@ from homeassistant.setup import async_setup_component from .test_controller import setup_unifi_integration -from tests.async_mock import AsyncMock from tests.common import MockConfigEntry, mock_coro diff --git a/tests/components/unifi_direct/test_device_tracker.py b/tests/components/unifi_direct/test_device_tracker.py index be58efa415a..1f96e3fd84b 100644 --- a/tests/components/unifi_direct/test_device_tracker.py +++ b/tests/components/unifi_direct/test_device_tracker.py @@ -1,6 +1,7 @@ """The tests for the Unifi direct device tracker platform.""" from datetime import timedelta import os +from unittest.mock import MagicMock, call, patch import pytest import voluptuous as vol @@ -22,7 +23,6 @@ from homeassistant.components.unifi_direct.device_tracker import ( from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PLATFORM, CONF_USERNAME from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, call, patch from tests.common import assert_setup_component, load_fixture, mock_component scanner_path = "homeassistant.components.unifi_direct.device_tracker.UnifiDeviceScanner" diff --git a/tests/components/universal/test_media_player.py b/tests/components/universal/test_media_player.py index 76a397496ad..fd75620f318 100644 --- a/tests/components/universal/test_media_player.py +++ b/tests/components/universal/test_media_player.py @@ -3,6 +3,7 @@ import asyncio from copy import copy from os import path import unittest +from unittest.mock import patch from voluptuous.error import MultipleInvalid @@ -23,7 +24,6 @@ from homeassistant.const import ( from homeassistant.core import Context, callback from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import get_test_home_assistant, mock_service diff --git a/tests/components/upb/test_config_flow.py b/tests/components/upb/test_config_flow.py index 0c874399f88..779c66f08aa 100644 --- a/tests/components/upb/test_config_flow.py +++ b/tests/components/upb/test_config_flow.py @@ -1,10 +1,10 @@ """Test the UPB Control config flow.""" +from unittest.mock import MagicMock, PropertyMock, patch + from homeassistant import config_entries, setup from homeassistant.components.upb.const import DOMAIN -from tests.async_mock import MagicMock, PropertyMock, patch - def mocked_upb(sync_complete=True, config_ok=True): """Mock UPB lib.""" diff --git a/tests/components/updater/test_init.py b/tests/components/updater/test_init.py index 89ebf9e1bbb..75ba6c1abd5 100644 --- a/tests/components/updater/test_init.py +++ b/tests/components/updater/test_init.py @@ -1,11 +1,12 @@ """The tests for the Updater component.""" +from unittest.mock import patch + import pytest from homeassistant.components import updater from homeassistant.helpers.update_coordinator import UpdateFailed from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import mock_component NEW_VERSION = "10000.0" diff --git a/tests/components/upnp/test_config_flow.py b/tests/components/upnp/test_config_flow.py index 997811a835f..be7794ce8e9 100644 --- a/tests/components/upnp/test_config_flow.py +++ b/tests/components/upnp/test_config_flow.py @@ -1,6 +1,7 @@ """Test UPnP/IGD config flow.""" from datetime import timedelta +from unittest.mock import AsyncMock, patch from homeassistant import config_entries, data_entry_flow from homeassistant.components import ssdp @@ -21,7 +22,6 @@ from homeassistant.setup import async_setup_component from .mock_device import MockDevice -from tests.async_mock import AsyncMock, patch from tests.common import MockConfigEntry diff --git a/tests/components/upnp/test_init.py b/tests/components/upnp/test_init.py index 960d6dacfe5..4373e175bc9 100644 --- a/tests/components/upnp/test_init.py +++ b/tests/components/upnp/test_init.py @@ -1,5 +1,7 @@ """Test UPnP/IGD setup process.""" +from unittest.mock import AsyncMock, patch + from homeassistant.components import upnp from homeassistant.components.upnp.const import ( DISCOVERY_LOCATION, @@ -12,7 +14,6 @@ from homeassistant.setup import async_setup_component from .mock_device import MockDevice -from tests.async_mock import AsyncMock, patch from tests.common import MockConfigEntry diff --git a/tests/components/usgs_earthquakes_feed/test_geo_location.py b/tests/components/usgs_earthquakes_feed/test_geo_location.py index cfd8ae40bcd..ee845701d81 100644 --- a/tests/components/usgs_earthquakes_feed/test_geo_location.py +++ b/tests/components/usgs_earthquakes_feed/test_geo_location.py @@ -1,5 +1,6 @@ """The tests for the USGS Earthquake Hazards Program Feed platform.""" import datetime +from unittest.mock import MagicMock, call, patch from homeassistant.components import geo_location from homeassistant.components.geo_location import ATTR_SOURCE @@ -31,7 +32,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import MagicMock, call, patch from tests.common import assert_setup_component, async_fire_time_changed CONFIG = { diff --git a/tests/components/utility_meter/test_init.py b/tests/components/utility_meter/test_init.py index c3a5d829a05..c422d3b5c1f 100644 --- a/tests/components/utility_meter/test_init.py +++ b/tests/components/utility_meter/test_init.py @@ -1,5 +1,6 @@ """The tests for the utility_meter component.""" from datetime import timedelta +from unittest.mock import patch from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN from homeassistant.components.utility_meter.const import ( @@ -18,8 +19,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch - async def test_services(hass): """Test energy sensor reset service.""" diff --git a/tests/components/utility_meter/test_sensor.py b/tests/components/utility_meter/test_sensor.py index 2856a63b4f5..bd34238592c 100644 --- a/tests/components/utility_meter/test_sensor.py +++ b/tests/components/utility_meter/test_sensor.py @@ -1,6 +1,7 @@ """The tests for the utility_meter sensor platform.""" from contextlib import contextmanager from datetime import timedelta +from unittest.mock import patch from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN from homeassistant.components.utility_meter.const import ( @@ -19,7 +20,6 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import async_fire_time_changed diff --git a/tests/components/velbus/test_config_flow.py b/tests/components/velbus/test_config_flow.py index 0a7bc4489c7..f4a95f0fdf9 100644 --- a/tests/components/velbus/test_config_flow.py +++ b/tests/components/velbus/test_config_flow.py @@ -1,11 +1,12 @@ """Tests for the Velbus config flow.""" +from unittest.mock import Mock, patch + import pytest from homeassistant import data_entry_flow from homeassistant.components.velbus import config_flow from homeassistant.const import CONF_NAME, CONF_PORT -from tests.async_mock import Mock, patch from tests.common import MockConfigEntry PORT_SERIAL = "/dev/ttyACME100" diff --git a/tests/components/vera/common.py b/tests/components/vera/common.py index 29c6a0e8683..43ef154b588 100644 --- a/tests/components/vera/common.py +++ b/tests/components/vera/common.py @@ -1,6 +1,7 @@ """Common code for tests.""" from enum import Enum from typing import Callable, Dict, NamedTuple, Tuple +from unittest.mock import MagicMock import pyvera as pv @@ -13,7 +14,6 @@ from homeassistant.components.vera.const import ( from homeassistant.core import HomeAssistant from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock from tests.common import MockConfigEntry SetupCallback = Callable[[pv.VeraController, dict], None] diff --git a/tests/components/vera/conftest.py b/tests/components/vera/conftest.py index c20dc4ed499..da027207748 100644 --- a/tests/components/vera/conftest.py +++ b/tests/components/vera/conftest.py @@ -1,9 +1,10 @@ """Fixtures for tests.""" +from unittest.mock import patch + import pytest from .common import ComponentFactory -from tests.async_mock import patch from tests.components.light.conftest import mock_light_profiles # noqa diff --git a/tests/components/vera/test_binary_sensor.py b/tests/components/vera/test_binary_sensor.py index a02c2ef1635..1bcb8d1a183 100644 --- a/tests/components/vera/test_binary_sensor.py +++ b/tests/components/vera/test_binary_sensor.py @@ -1,12 +1,12 @@ """Vera tests.""" +from unittest.mock import MagicMock + import pyvera as pv from homeassistant.core import HomeAssistant from .common import ComponentFactory, new_simple_controller_config -from tests.async_mock import MagicMock - async def test_binary_sensor( hass: HomeAssistant, vera_component_factory: ComponentFactory diff --git a/tests/components/vera/test_climate.py b/tests/components/vera/test_climate.py index 370ecc18dcd..076b51997a0 100644 --- a/tests/components/vera/test_climate.py +++ b/tests/components/vera/test_climate.py @@ -1,4 +1,6 @@ """Vera tests.""" +from unittest.mock import MagicMock + import pyvera as pv from homeassistant.components.climate.const import ( @@ -13,8 +15,6 @@ from homeassistant.core import HomeAssistant from .common import ComponentFactory, new_simple_controller_config -from tests.async_mock import MagicMock - async def test_climate( hass: HomeAssistant, vera_component_factory: ComponentFactory diff --git a/tests/components/vera/test_common.py b/tests/components/vera/test_common.py index 509bbc5f96a..3832daf0710 100644 --- a/tests/components/vera/test_common.py +++ b/tests/components/vera/test_common.py @@ -1,11 +1,11 @@ """Tests for common vera code.""" from datetime import timedelta +from unittest.mock import MagicMock from homeassistant.components.vera import SubscriptionRegistry from homeassistant.core import HomeAssistant from homeassistant.util.dt import utcnow -from tests.async_mock import MagicMock from tests.common import async_fire_time_changed diff --git a/tests/components/vera/test_config_flow.py b/tests/components/vera/test_config_flow.py index dceac728e4d..780583e38ab 100644 --- a/tests/components/vera/test_config_flow.py +++ b/tests/components/vera/test_config_flow.py @@ -1,4 +1,6 @@ """Vera tests.""" +from unittest.mock import MagicMock, patch + from requests.exceptions import RequestException from homeassistant import config_entries, data_entry_flow @@ -7,7 +9,6 @@ from homeassistant.const import CONF_EXCLUDE, CONF_LIGHTS, CONF_SOURCE from homeassistant.core import HomeAssistant from homeassistant.data_entry_flow import RESULT_TYPE_CREATE_ENTRY, RESULT_TYPE_FORM -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry, mock_registry diff --git a/tests/components/vera/test_cover.py b/tests/components/vera/test_cover.py index f3dc2263749..0c05d84e2db 100644 --- a/tests/components/vera/test_cover.py +++ b/tests/components/vera/test_cover.py @@ -1,12 +1,12 @@ """Vera tests.""" +from unittest.mock import MagicMock + import pyvera as pv from homeassistant.core import HomeAssistant from .common import ComponentFactory, new_simple_controller_config -from tests.async_mock import MagicMock - async def test_cover( hass: HomeAssistant, vera_component_factory: ComponentFactory diff --git a/tests/components/vera/test_init.py b/tests/components/vera/test_init.py index b3f7b3249ef..b1d6010336a 100644 --- a/tests/components/vera/test_init.py +++ b/tests/components/vera/test_init.py @@ -1,4 +1,6 @@ """Vera tests.""" +from unittest.mock import MagicMock + import pytest import pyvera as pv from requests.exceptions import RequestException @@ -14,7 +16,6 @@ from homeassistant.core import HomeAssistant from .common import ComponentFactory, ConfigSource, new_simple_controller_config -from tests.async_mock import MagicMock from tests.common import MockConfigEntry, mock_registry diff --git a/tests/components/vera/test_light.py b/tests/components/vera/test_light.py index 72118e33a31..3b14aba7429 100644 --- a/tests/components/vera/test_light.py +++ b/tests/components/vera/test_light.py @@ -1,4 +1,6 @@ """Vera tests.""" +from unittest.mock import MagicMock + import pyvera as pv from homeassistant.components.light import ATTR_BRIGHTNESS, ATTR_HS_COLOR @@ -6,8 +8,6 @@ from homeassistant.core import HomeAssistant from .common import ComponentFactory, new_simple_controller_config -from tests.async_mock import MagicMock - async def test_light( hass: HomeAssistant, vera_component_factory: ComponentFactory diff --git a/tests/components/vera/test_lock.py b/tests/components/vera/test_lock.py index b3433b2bafb..c288ac8709e 100644 --- a/tests/components/vera/test_lock.py +++ b/tests/components/vera/test_lock.py @@ -1,4 +1,6 @@ """Vera tests.""" +from unittest.mock import MagicMock + import pyvera as pv from homeassistant.const import STATE_LOCKED, STATE_UNLOCKED @@ -6,8 +8,6 @@ from homeassistant.core import HomeAssistant from .common import ComponentFactory, new_simple_controller_config -from tests.async_mock import MagicMock - async def test_lock( hass: HomeAssistant, vera_component_factory: ComponentFactory diff --git a/tests/components/vera/test_scene.py b/tests/components/vera/test_scene.py index 6c80f27d8c8..2d4b7375498 100644 --- a/tests/components/vera/test_scene.py +++ b/tests/components/vera/test_scene.py @@ -1,12 +1,12 @@ """Vera tests.""" +from unittest.mock import MagicMock + import pyvera as pv from homeassistant.core import HomeAssistant from .common import ComponentFactory, new_simple_controller_config -from tests.async_mock import MagicMock - async def test_scene( hass: HomeAssistant, vera_component_factory: ComponentFactory diff --git a/tests/components/vera/test_sensor.py b/tests/components/vera/test_sensor.py index 3d6b11b0685..43777642816 100644 --- a/tests/components/vera/test_sensor.py +++ b/tests/components/vera/test_sensor.py @@ -1,5 +1,6 @@ """Vera tests.""" from typing import Any, Callable, Tuple +from unittest.mock import MagicMock import pyvera as pv @@ -8,8 +9,6 @@ from homeassistant.core import HomeAssistant from .common import ComponentFactory, new_simple_controller_config -from tests.async_mock import MagicMock - async def run_sensor_test( hass: HomeAssistant, diff --git a/tests/components/vera/test_switch.py b/tests/components/vera/test_switch.py index 42c74e4e843..b61564c56bc 100644 --- a/tests/components/vera/test_switch.py +++ b/tests/components/vera/test_switch.py @@ -1,12 +1,12 @@ """Vera tests.""" +from unittest.mock import MagicMock + import pyvera as pv from homeassistant.core import HomeAssistant from .common import ComponentFactory, new_simple_controller_config -from tests.async_mock import MagicMock - async def test_switch( hass: HomeAssistant, vera_component_factory: ComponentFactory diff --git a/tests/components/verisure/test_ethernet_status.py b/tests/components/verisure/test_ethernet_status.py index 139ac01a1c6..611adde19d9 100644 --- a/tests/components/verisure/test_ethernet_status.py +++ b/tests/components/verisure/test_ethernet_status.py @@ -1,12 +1,11 @@ """Test Verisure ethernet status.""" from contextlib import contextmanager +from unittest.mock import patch from homeassistant.components.verisure import DOMAIN as VERISURE_DOMAIN from homeassistant.const import STATE_UNAVAILABLE from homeassistant.setup import async_setup_component -from tests.async_mock import patch - CONFIG = { "verisure": { "username": "test", diff --git a/tests/components/verisure/test_lock.py b/tests/components/verisure/test_lock.py index decce67dc11..d41bbab2037 100644 --- a/tests/components/verisure/test_lock.py +++ b/tests/components/verisure/test_lock.py @@ -1,6 +1,7 @@ """Tests for the Verisure platform.""" from contextlib import contextmanager +from unittest.mock import call, patch from homeassistant.components.lock import ( DOMAIN as LOCK_DOMAIN, @@ -11,8 +12,6 @@ from homeassistant.components.verisure import DOMAIN as VERISURE_DOMAIN from homeassistant.const import STATE_UNLOCKED from homeassistant.setup import async_setup_component -from tests.async_mock import call, patch - NO_DEFAULT_LOCK_CODE_CONFIG = { "verisure": { "username": "test", diff --git a/tests/components/version/test_sensor.py b/tests/components/version/test_sensor.py index 471043ae3ae..164b4090e5f 100644 --- a/tests/components/version/test_sensor.py +++ b/tests/components/version/test_sensor.py @@ -1,7 +1,7 @@ """The test for the version sensor platform.""" -from homeassistant.setup import async_setup_component +from unittest.mock import patch -from tests.async_mock import patch +from homeassistant.setup import async_setup_component MOCK_VERSION = "10.0" diff --git a/tests/components/vesync/test_config_flow.py b/tests/components/vesync/test_config_flow.py index c82307d351c..f302d0ca5b3 100644 --- a/tests/components/vesync/test_config_flow.py +++ b/tests/components/vesync/test_config_flow.py @@ -1,9 +1,10 @@ """Test for vesync config flow.""" +from unittest.mock import patch + from homeassistant import data_entry_flow from homeassistant.components.vesync import DOMAIN, config_flow from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/vilfo/test_config_flow.py b/tests/components/vilfo/test_config_flow.py index ca77b199cfa..6e98ef3fdd9 100644 --- a/tests/components/vilfo/test_config_flow.py +++ b/tests/components/vilfo/test_config_flow.py @@ -1,12 +1,12 @@ """Test the Vilfo Router config flow.""" +from unittest.mock import Mock, patch + import vilfo from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.vilfo.const import DOMAIN from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST, CONF_ID, CONF_MAC -from tests.async_mock import Mock, patch - async def test_form(hass): """Test we get the form.""" diff --git a/tests/components/vizio/conftest.py b/tests/components/vizio/conftest.py index c8a9083bb1a..917e6f7f291 100644 --- a/tests/components/vizio/conftest.py +++ b/tests/components/vizio/conftest.py @@ -1,4 +1,6 @@ """Configure py.test.""" +from unittest.mock import AsyncMock, patch + import pytest from pyvizio.api.apps import AppConfig from pyvizio.const import DEVICE_CLASS_SPEAKER, MAX_VOLUME @@ -22,8 +24,6 @@ from .const import ( MockStartPairingResponse, ) -from tests.async_mock import AsyncMock, patch - class MockInput: """Mock Vizio device input.""" diff --git a/tests/components/vizio/test_media_player.py b/tests/components/vizio/test_media_player.py index 0d11ec2289c..78976032b00 100644 --- a/tests/components/vizio/test_media_player.py +++ b/tests/components/vizio/test_media_player.py @@ -2,6 +2,7 @@ from contextlib import asynccontextmanager from datetime import timedelta from typing import Any, Dict, List, Optional +from unittest.mock import call, patch import pytest from pytest import raises @@ -75,7 +76,6 @@ from .const import ( VOLUME_STEP, ) -from tests.async_mock import call, patch from tests.common import MockConfigEntry, async_fire_time_changed diff --git a/tests/components/volumio/test_config_flow.py b/tests/components/volumio/test_config_flow.py index 477ef25cb87..86b5027cd3d 100644 --- a/tests/components/volumio/test_config_flow.py +++ b/tests/components/volumio/test_config_flow.py @@ -1,9 +1,10 @@ """Test the Volumio config flow.""" +from unittest.mock import patch + from homeassistant import config_entries from homeassistant.components.volumio.config_flow import CannotConnectError from homeassistant.components.volumio.const import DOMAIN -from tests.async_mock import patch from tests.common import MockConfigEntry TEST_SYSTEM_INFO = {"id": "1111-1111-1111-1111", "name": "TestVolumio"} diff --git a/tests/components/vultr/test_binary_sensor.py b/tests/components/vultr/test_binary_sensor.py index af99dc12c5f..ab12bfda12c 100644 --- a/tests/components/vultr/test_binary_sensor.py +++ b/tests/components/vultr/test_binary_sensor.py @@ -1,6 +1,7 @@ """Test the Vultr binary sensor platform.""" import json import unittest +from unittest.mock import patch import pytest import requests_mock @@ -19,7 +20,6 @@ from homeassistant.components.vultr import ( ) from homeassistant.const import CONF_NAME, CONF_PLATFORM -from tests.async_mock import patch from tests.common import get_test_home_assistant, load_fixture from tests.components.vultr.test_init import VALID_CONFIG diff --git a/tests/components/vultr/test_init.py b/tests/components/vultr/test_init.py index 9ce96d7969c..80480a2cec2 100644 --- a/tests/components/vultr/test_init.py +++ b/tests/components/vultr/test_init.py @@ -2,13 +2,13 @@ from copy import deepcopy import json import unittest +from unittest.mock import patch import requests_mock from homeassistant import setup import homeassistant.components.vultr as vultr -from tests.async_mock import patch from tests.common import get_test_home_assistant, load_fixture VALID_CONFIG = {"vultr": {"api_key": "ABCDEFG1234567"}} diff --git a/tests/components/vultr/test_sensor.py b/tests/components/vultr/test_sensor.py index 8e9cb606d1e..2b5e07c80b5 100644 --- a/tests/components/vultr/test_sensor.py +++ b/tests/components/vultr/test_sensor.py @@ -1,6 +1,7 @@ """The tests for the Vultr sensor platform.""" import json import unittest +from unittest.mock import patch import pytest import requests_mock @@ -16,7 +17,6 @@ from homeassistant.const import ( DATA_GIGABYTES, ) -from tests.async_mock import patch from tests.common import get_test_home_assistant, load_fixture from tests.components.vultr.test_init import VALID_CONFIG diff --git a/tests/components/vultr/test_switch.py b/tests/components/vultr/test_switch.py index 77eb1e7a8c6..12af400a44a 100644 --- a/tests/components/vultr/test_switch.py +++ b/tests/components/vultr/test_switch.py @@ -1,6 +1,7 @@ """Test the Vultr switch platform.""" import json import unittest +from unittest.mock import patch import pytest import requests_mock @@ -19,7 +20,6 @@ from homeassistant.components.vultr import ( ) from homeassistant.const import CONF_NAME, CONF_PLATFORM -from tests.async_mock import patch from tests.common import get_test_home_assistant, load_fixture from tests.components.vultr.test_init import VALID_CONFIG diff --git a/tests/components/wake_on_lan/test_init.py b/tests/components/wake_on_lan/test_init.py index 60a725a7f9e..3ec7a53a436 100644 --- a/tests/components/wake_on_lan/test_init.py +++ b/tests/components/wake_on_lan/test_init.py @@ -1,12 +1,12 @@ """Tests for Wake On LAN component.""" +from unittest.mock import patch + import pytest import voluptuous as vol from homeassistant.components.wake_on_lan import DOMAIN, SERVICE_SEND_MAGIC_PACKET from homeassistant.setup import async_setup_component -from tests.async_mock import patch - async def test_send_magic_packet(hass): """Test of send magic packet service call.""" diff --git a/tests/components/wake_on_lan/test_switch.py b/tests/components/wake_on_lan/test_switch.py index 598eb3a522e..c2e32f77ccf 100644 --- a/tests/components/wake_on_lan/test_switch.py +++ b/tests/components/wake_on_lan/test_switch.py @@ -1,6 +1,7 @@ """The tests for the wake on lan switch platform.""" import platform import subprocess +from unittest.mock import patch import pytest @@ -14,7 +15,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.common import async_mock_service diff --git a/tests/components/webhook/test_trigger.py b/tests/components/webhook/test_trigger.py index 46459bd88c4..2a22c330e14 100644 --- a/tests/components/webhook/test_trigger.py +++ b/tests/components/webhook/test_trigger.py @@ -1,10 +1,11 @@ """The tests for the webhook automation trigger.""" +from unittest.mock import patch + import pytest from homeassistant.core import callback from homeassistant.setup import async_setup_component -from tests.async_mock import patch from tests.components.blueprint.conftest import stub_blueprint_populate # noqa diff --git a/tests/components/webostv/test_media_player.py b/tests/components/webostv/test_media_player.py index 1b85daa1922..8ddc7b31657 100644 --- a/tests/components/webostv/test_media_player.py +++ b/tests/components/webostv/test_media_player.py @@ -26,9 +26,9 @@ from homeassistant.const import ( from homeassistant.setup import async_setup_component if sys.version_info >= (3, 8, 0): - from tests.async_mock import patch + from unittest.mock import patch else: - from tests.async_mock import patch + from unittest.mock import patch NAME = "fake" diff --git a/tests/components/websocket_api/test_http.py b/tests/components/websocket_api/test_http.py index e76cbe0dbdc..d3cf4b854f8 100644 --- a/tests/components/websocket_api/test_http.py +++ b/tests/components/websocket_api/test_http.py @@ -1,5 +1,6 @@ """Test Websocket API http module.""" from datetime import timedelta +from unittest.mock import patch from aiohttp import WSMsgType import pytest @@ -7,7 +8,6 @@ import pytest from homeassistant.components.websocket_api import const, http from homeassistant.util.dt import utcnow -from tests.async_mock import patch from tests.common import async_fire_time_changed diff --git a/tests/components/websocket_api/test_init.py b/tests/components/websocket_api/test_init.py index 2d656de8eeb..041c0e76533 100644 --- a/tests/components/websocket_api/test_init.py +++ b/tests/components/websocket_api/test_init.py @@ -1,11 +1,11 @@ """Tests for the Home Assistant Websocket API.""" +from unittest.mock import Mock, patch + from aiohttp import WSMsgType import voluptuous as vol from homeassistant.components.websocket_api import const, messages -from tests.async_mock import Mock, patch - async def test_invalid_message_format(websocket_client): """Test sending invalid JSON.""" diff --git a/tests/components/wemo/conftest.py b/tests/components/wemo/conftest.py index 573de21c692..0e0a69216b2 100644 --- a/tests/components/wemo/conftest.py +++ b/tests/components/wemo/conftest.py @@ -1,5 +1,6 @@ """Fixtures for pywemo.""" import asyncio +from unittest.mock import create_autospec, patch import pytest import pywemo @@ -8,8 +9,6 @@ from homeassistant.components.wemo import CONF_DISCOVERY, CONF_STATIC from homeassistant.components.wemo.const import DOMAIN from homeassistant.setup import async_setup_component -from tests.async_mock import create_autospec, patch - MOCK_HOST = "127.0.0.1" MOCK_PORT = 50000 MOCK_NAME = "WemoDeviceName" diff --git a/tests/components/wemo/entity_test_helpers.py b/tests/components/wemo/entity_test_helpers.py index 16a2f8b3f0d..0ecfc46d526 100644 --- a/tests/components/wemo/entity_test_helpers.py +++ b/tests/components/wemo/entity_test_helpers.py @@ -4,6 +4,7 @@ This is not a test module. These test methods are used by the platform test modu """ import asyncio import threading +from unittest.mock import patch from homeassistant.components.homeassistant import ( DOMAIN as HA_DOMAIN, @@ -13,8 +14,6 @@ from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_UNAVAILABLE from homeassistant.core import callback from homeassistant.setup import async_setup_component -from tests.async_mock import patch - def _perform_registry_callback(hass, pywemo_registry, pywemo_device): """Return a callable method to trigger a state callback from the device.""" diff --git a/tests/components/wemo/test_init.py b/tests/components/wemo/test_init.py index 2af91c0fe32..374222d8688 100644 --- a/tests/components/wemo/test_init.py +++ b/tests/components/wemo/test_init.py @@ -1,5 +1,6 @@ """Tests for the wemo component.""" from datetime import timedelta +from unittest.mock import create_autospec, patch import pywemo @@ -10,7 +11,6 @@ from homeassistant.util import dt from .conftest import MOCK_HOST, MOCK_NAME, MOCK_PORT, MOCK_SERIAL_NUMBER -from tests.async_mock import create_autospec, patch from tests.common import async_fire_time_changed diff --git a/tests/components/wemo/test_light_bridge.py b/tests/components/wemo/test_light_bridge.py index 1a36e5421ec..3e7f79200c6 100644 --- a/tests/components/wemo/test_light_bridge.py +++ b/tests/components/wemo/test_light_bridge.py @@ -1,4 +1,6 @@ """Tests for the Wemo light entity via the bridge.""" +from unittest.mock import create_autospec, patch + import pytest import pywemo @@ -13,8 +15,6 @@ import homeassistant.util.dt as dt_util from . import entity_test_helpers -from tests.async_mock import create_autospec, patch - @pytest.fixture def pywemo_model(): diff --git a/tests/components/wiffi/test_config_flow.py b/tests/components/wiffi/test_config_flow.py index cd129d112bc..50433d377a9 100644 --- a/tests/components/wiffi/test_config_flow.py +++ b/tests/components/wiffi/test_config_flow.py @@ -1,5 +1,6 @@ """Test the wiffi integration config flow.""" import errno +from unittest.mock import patch import pytest @@ -12,7 +13,6 @@ from homeassistant.data_entry_flow import ( RESULT_TYPE_FORM, ) -from tests.async_mock import patch from tests.common import MockConfigEntry MOCK_CONFIG = {CONF_PORT: 8765} diff --git a/tests/components/wilight/test_config_flow.py b/tests/components/wilight/test_config_flow.py index c8476cbe349..41a44cda174 100644 --- a/tests/components/wilight/test_config_flow.py +++ b/tests/components/wilight/test_config_flow.py @@ -1,4 +1,6 @@ """Test the WiLight config flow.""" +from unittest.mock import patch + import pytest from homeassistant.components.wilight.config_flow import ( @@ -15,7 +17,6 @@ from homeassistant.data_entry_flow import ( ) from homeassistant.helpers.typing import HomeAssistantType -from tests.async_mock import patch from tests.common import MockConfigEntry from tests.components.wilight import ( CONF_COMPONENTS, diff --git a/tests/components/wilight/test_init.py b/tests/components/wilight/test_init.py index efd779a29df..c1557fb44d3 100644 --- a/tests/components/wilight/test_init.py +++ b/tests/components/wilight/test_init.py @@ -1,4 +1,6 @@ """Tests for the WiLight integration.""" +from unittest.mock import patch + import pytest import pywilight @@ -10,7 +12,6 @@ from homeassistant.config_entries import ( ) from homeassistant.helpers.typing import HomeAssistantType -from tests.async_mock import patch from tests.components.wilight import ( HOST, UPNP_MAC_ADDRESS, diff --git a/tests/components/wilight/test_light.py b/tests/components/wilight/test_light.py index d02c7233e60..b7250df546d 100644 --- a/tests/components/wilight/test_light.py +++ b/tests/components/wilight/test_light.py @@ -1,4 +1,6 @@ """Tests for the WiLight integration.""" +from unittest.mock import patch + import pytest import pywilight @@ -16,7 +18,6 @@ from homeassistant.const import ( ) from homeassistant.helpers.typing import HomeAssistantType -from tests.async_mock import patch from tests.components.wilight import ( HOST, UPNP_MAC_ADDRESS, diff --git a/tests/components/withings/common.py b/tests/components/withings/common.py index 000900c3355..80e6d07654c 100644 --- a/tests/components/withings/common.py +++ b/tests/components/withings/common.py @@ -1,6 +1,7 @@ """Common data for for the withings component tests.""" from dataclasses import dataclass from typing import List, Optional, Tuple, Union +from unittest.mock import MagicMock from urllib.parse import urlparse from aiohttp.test_utils import TestClient @@ -39,7 +40,6 @@ from homeassistant.helpers import config_entry_oauth2_flow from homeassistant.helpers.config_entry_oauth2_flow import AUTH_CALLBACK_PATH from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/withings/test_common.py b/tests/components/withings/test_common.py index 2bf71ab7aa5..a5946ff0533 100644 --- a/tests/components/withings/test_common.py +++ b/tests/components/withings/test_common.py @@ -2,6 +2,7 @@ import datetime import re from typing import Any +from unittest.mock import MagicMock from urllib.parse import urlparse from aiohttp.test_utils import TestClient @@ -17,7 +18,6 @@ from homeassistant.components.withings.common import ( from homeassistant.core import HomeAssistant from homeassistant.helpers.config_entry_oauth2_flow import AbstractOAuth2Implementation -from tests.async_mock import MagicMock from tests.common import MockConfigEntry from tests.components.withings.common import ( ComponentFactory, diff --git a/tests/components/withings/test_init.py b/tests/components/withings/test_init.py index 4f4a85585bf..a9948860745 100644 --- a/tests/components/withings/test_init.py +++ b/tests/components/withings/test_init.py @@ -1,4 +1,6 @@ """Tests for the Withings component.""" +from unittest.mock import MagicMock, patch + import pytest import voluptuous as vol from withings_api.common import UnauthorizedException @@ -25,7 +27,6 @@ from .common import ( new_profile_config, ) -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry diff --git a/tests/components/wled/test_config_flow.py b/tests/components/wled/test_config_flow.py index aed10ca3466..4ed1723be77 100644 --- a/tests/components/wled/test_config_flow.py +++ b/tests/components/wled/test_config_flow.py @@ -1,4 +1,6 @@ """Tests for the WLED config flow.""" +from unittest.mock import MagicMock, patch + import aiohttp from wled import WLEDConnectionError @@ -10,7 +12,6 @@ from homeassistant.core import HomeAssistant from . import init_integration -from tests.async_mock import MagicMock, patch from tests.common import load_fixture from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/wled/test_init.py b/tests/components/wled/test_init.py index 8ed043530ae..edce49cfd80 100644 --- a/tests/components/wled/test_init.py +++ b/tests/components/wled/test_init.py @@ -1,11 +1,12 @@ """Tests for the WLED integration.""" +from unittest.mock import MagicMock, patch + from wled import WLEDConnectionError from homeassistant.components.wled.const import DOMAIN from homeassistant.config_entries import ENTRY_STATE_SETUP_RETRY from homeassistant.core import HomeAssistant -from tests.async_mock import MagicMock, patch from tests.components.wled import init_integration from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/wled/test_light.py b/tests/components/wled/test_light.py index fbcc6ca71b6..eb9124ab906 100644 --- a/tests/components/wled/test_light.py +++ b/tests/components/wled/test_light.py @@ -1,5 +1,6 @@ """Tests for the WLED light platform.""" import json +from unittest.mock import patch from wled import Device as WLEDDevice, WLEDConnectionError @@ -37,7 +38,6 @@ from homeassistant.const import ( from homeassistant.core import HomeAssistant import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import async_fire_time_changed, load_fixture from tests.components.wled import init_integration from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/wled/test_sensor.py b/tests/components/wled/test_sensor.py index d5c1c738d2f..11e14bd79d9 100644 --- a/tests/components/wled/test_sensor.py +++ b/tests/components/wled/test_sensor.py @@ -1,5 +1,6 @@ """Tests for the WLED sensor platform.""" from datetime import datetime +from unittest.mock import patch import pytest @@ -24,7 +25,6 @@ from homeassistant.const import ( from homeassistant.core import HomeAssistant from homeassistant.util import dt as dt_util -from tests.async_mock import patch from tests.components.wled import init_integration from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/wled/test_switch.py b/tests/components/wled/test_switch.py index 388e3317b39..c6e30ef903e 100644 --- a/tests/components/wled/test_switch.py +++ b/tests/components/wled/test_switch.py @@ -1,4 +1,6 @@ """Tests for the WLED switch platform.""" +from unittest.mock import patch + from wled import WLEDConnectionError from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN @@ -19,7 +21,6 @@ from homeassistant.const import ( ) from homeassistant.core import HomeAssistant -from tests.async_mock import patch from tests.components.wled import init_integration from tests.test_util.aiohttp import AiohttpClientMocker diff --git a/tests/components/wolflink/test_config_flow.py b/tests/components/wolflink/test_config_flow.py index 897650b48e8..5108883ed81 100644 --- a/tests/components/wolflink/test_config_flow.py +++ b/tests/components/wolflink/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Wolf SmartSet Service config flow.""" +from unittest.mock import patch + from httpcore import ConnectError from wolf_smartset.models import Device from wolf_smartset.token_auth import InvalidAuth @@ -12,7 +14,6 @@ from homeassistant.components.wolflink.const import ( ) from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from tests.async_mock import patch from tests.common import MockConfigEntry CONFIG = { diff --git a/tests/components/workday/test_binary_sensor.py b/tests/components/workday/test_binary_sensor.py index 7d50ec2994c..3ec17c3e6d3 100644 --- a/tests/components/workday/test_binary_sensor.py +++ b/tests/components/workday/test_binary_sensor.py @@ -1,5 +1,6 @@ """Tests the Home Assistant workday binary sensor.""" from datetime import date +from unittest.mock import patch import pytest import voluptuous as vol @@ -7,7 +8,6 @@ import voluptuous as vol import homeassistant.components.workday.binary_sensor as binary_sensor from homeassistant.setup import setup_component -from tests.async_mock import patch from tests.common import assert_setup_component, get_test_home_assistant FUNCTION_PATH = "homeassistant.components.workday.binary_sensor.get_date" diff --git a/tests/components/xbox/test_config_flow.py b/tests/components/xbox/test_config_flow.py index 516a57c039b..7e2863a5861 100644 --- a/tests/components/xbox/test_config_flow.py +++ b/tests/components/xbox/test_config_flow.py @@ -1,9 +1,10 @@ """Test the xbox config flow.""" +from unittest.mock import patch + from homeassistant import config_entries, data_entry_flow, setup from homeassistant.components.xbox.const import DOMAIN, OAUTH2_AUTHORIZE, OAUTH2_TOKEN from homeassistant.helpers import config_entry_oauth2_flow -from tests.async_mock import patch from tests.common import MockConfigEntry CLIENT_ID = "1234" diff --git a/tests/components/xiaomi/test_device_tracker.py b/tests/components/xiaomi/test_device_tracker.py index 1760b3274a4..af5e192b9cf 100644 --- a/tests/components/xiaomi/test_device_tracker.py +++ b/tests/components/xiaomi/test_device_tracker.py @@ -1,5 +1,6 @@ """The tests for the Xiaomi router device tracker platform.""" import logging +from unittest.mock import MagicMock, call, patch import requests @@ -8,8 +9,6 @@ import homeassistant.components.xiaomi.device_tracker as xiaomi from homeassistant.components.xiaomi.device_tracker import get_scanner from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PLATFORM, CONF_USERNAME -from tests.async_mock import MagicMock, call, patch - _LOGGER = logging.getLogger(__name__) INVALID_USERNAME = "bob" diff --git a/tests/components/xiaomi_aqara/test_config_flow.py b/tests/components/xiaomi_aqara/test_config_flow.py index c84758f8b63..280775a7130 100644 --- a/tests/components/xiaomi_aqara/test_config_flow.py +++ b/tests/components/xiaomi_aqara/test_config_flow.py @@ -1,5 +1,6 @@ """Test the Xiaomi Aqara config flow.""" from socket import gaierror +from unittest.mock import Mock, patch import pytest @@ -8,8 +9,6 @@ from homeassistant.components import zeroconf from homeassistant.components.xiaomi_aqara import config_flow, const from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, CONF_PORT -from tests.async_mock import Mock, patch - ZEROCONF_NAME = "name" ZEROCONF_PROP = "properties" ZEROCONF_MAC = "mac" diff --git a/tests/components/xiaomi_miio/test_config_flow.py b/tests/components/xiaomi_miio/test_config_flow.py index d8ddd657efc..dbe78957586 100644 --- a/tests/components/xiaomi_miio/test_config_flow.py +++ b/tests/components/xiaomi_miio/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Xiaomi Miio config flow.""" +from unittest.mock import Mock, patch + from miio import DeviceException from homeassistant import config_entries @@ -6,8 +8,6 @@ from homeassistant.components import zeroconf from homeassistant.components.xiaomi_miio import config_flow, const from homeassistant.const import CONF_HOST, CONF_NAME, CONF_TOKEN -from tests.async_mock import Mock, patch - ZEROCONF_NAME = "name" ZEROCONF_PROP = "properties" ZEROCONF_MAC = "mac" diff --git a/tests/components/xiaomi_miio/test_vacuum.py b/tests/components/xiaomi_miio/test_vacuum.py index 0fa241fb0b9..b1a3c08b84b 100644 --- a/tests/components/xiaomi_miio/test_vacuum.py +++ b/tests/components/xiaomi_miio/test_vacuum.py @@ -1,6 +1,7 @@ """The tests for the Xiaomi vacuum platform.""" from datetime import datetime, time, timedelta from unittest import mock +from unittest.mock import MagicMock, patch from miio import DeviceException import pytest @@ -57,8 +58,6 @@ from homeassistant.const import ( ) from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, patch - PLATFORM = "xiaomi_miio" # calls made when device status is requested diff --git a/tests/components/yamaha/test_media_player.py b/tests/components/yamaha/test_media_player.py index 6a13c1d46e1..84a9e475c32 100644 --- a/tests/components/yamaha/test_media_player.py +++ b/tests/components/yamaha/test_media_player.py @@ -1,4 +1,6 @@ """The tests for the Yamaha Media player platform.""" +from unittest.mock import MagicMock, PropertyMock, call, patch + import pytest import homeassistant.components.media_player as mp @@ -7,8 +9,6 @@ from homeassistant.components.yamaha.const import DOMAIN from homeassistant.helpers.discovery import async_load_platform from homeassistant.setup import async_setup_component -from tests.async_mock import MagicMock, PropertyMock, call, patch - CONFIG = {"media_player": {"platform": "yamaha", "host": "127.0.0.1"}} diff --git a/tests/components/yandex_transport/test_yandex_transport_sensor.py b/tests/components/yandex_transport/test_yandex_transport_sensor.py index c70ebf6806c..a727ea6e6cd 100644 --- a/tests/components/yandex_transport/test_yandex_transport_sensor.py +++ b/tests/components/yandex_transport/test_yandex_transport_sensor.py @@ -1,6 +1,7 @@ """Tests for the yandex transport platform.""" import json +from unittest.mock import AsyncMock, patch import pytest @@ -9,7 +10,6 @@ from homeassistant.const import CONF_NAME from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import AsyncMock, patch from tests.common import assert_setup_component, load_fixture REPLY = json.loads(load_fixture("yandex_transport_reply.json")) diff --git a/tests/components/yeelight/__init__.py b/tests/components/yeelight/__init__.py index 5405b69490b..38c28a9a900 100644 --- a/tests/components/yeelight/__init__.py +++ b/tests/components/yeelight/__init__.py @@ -1,4 +1,6 @@ """Tests for the Yeelight integration.""" +from unittest.mock import MagicMock, patch + from yeelight import BulbException, BulbType from yeelight.main import _MODEL_SPECS @@ -12,8 +14,6 @@ from homeassistant.components.yeelight import ( ) from homeassistant.const import CONF_DEVICES, CONF_ID, CONF_NAME -from tests.async_mock import MagicMock, patch - IP_ADDRESS = "192.168.1.239" MODEL = "color" ID = "0x000000000015243f" diff --git a/tests/components/yeelight/test_binary_sensor.py b/tests/components/yeelight/test_binary_sensor.py index 8b2ec835722..f716469fc9a 100644 --- a/tests/components/yeelight/test_binary_sensor.py +++ b/tests/components/yeelight/test_binary_sensor.py @@ -1,4 +1,6 @@ """Test the Yeelight binary sensor.""" +from unittest.mock import patch + from homeassistant.components.yeelight import DOMAIN from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_component @@ -6,8 +8,6 @@ from homeassistant.setup import async_setup_component from . import MODULE, NAME, PROPERTIES, YAML_CONFIGURATION, _mocked_bulb -from tests.async_mock import patch - ENTITY_BINARY_SENSOR = f"binary_sensor.{NAME}_nightlight" diff --git a/tests/components/yeelight/test_config_flow.py b/tests/components/yeelight/test_config_flow.py index 10191a5f6c7..8fa1ba5c988 100644 --- a/tests/components/yeelight/test_config_flow.py +++ b/tests/components/yeelight/test_config_flow.py @@ -1,4 +1,6 @@ """Test the Yeelight config flow.""" +from unittest.mock import MagicMock, patch + from homeassistant import config_entries from homeassistant.components.yeelight import ( CONF_DEVICE, @@ -30,7 +32,6 @@ from . import ( _patch_discovery, ) -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry DEFAULT_CONFIG = { diff --git a/tests/components/yeelight/test_init.py b/tests/components/yeelight/test_init.py index 882f9944ca1..c91ae33d986 100644 --- a/tests/components/yeelight/test_init.py +++ b/tests/components/yeelight/test_init.py @@ -1,5 +1,5 @@ """Test Yeelight.""" -from unittest.mock import MagicMock +from unittest.mock import MagicMock, patch from yeelight import BulbType @@ -32,7 +32,6 @@ from . import ( _patch_discovery, ) -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/yeelight/test_light.py b/tests/components/yeelight/test_light.py index 115b825d863..0b7415140a3 100644 --- a/tests/components/yeelight/test_light.py +++ b/tests/components/yeelight/test_light.py @@ -1,5 +1,6 @@ """Test the Yeelight light.""" import logging +from unittest.mock import MagicMock, patch from yeelight import ( BulbException, @@ -107,7 +108,6 @@ from . import ( _patch_discovery, ) -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry CONFIG_ENTRY_DATA = { diff --git a/tests/components/zeroconf/test_init.py b/tests/components/zeroconf/test_init.py index 6b79c552911..51bdf269bf2 100644 --- a/tests/components/zeroconf/test_init.py +++ b/tests/components/zeroconf/test_init.py @@ -1,4 +1,6 @@ """Test Zeroconf component setup process.""" +from unittest.mock import patch + from zeroconf import ( BadTypeInNameException, InterfaceChoice, @@ -17,8 +19,6 @@ from homeassistant.const import ( from homeassistant.generated import zeroconf as zc_gen from homeassistant.setup import async_setup_component -from tests.async_mock import patch - NON_UTF8_VALUE = b"ABCDEF\x8a" NON_ASCII_KEY = b"non-ascii-key\x8a" PROPERTIES = { diff --git a/tests/components/zeroconf/test_usage.py b/tests/components/zeroconf/test_usage.py index 9cf953f4c8d..0f902632db8 100644 --- a/tests/components/zeroconf/test_usage.py +++ b/tests/components/zeroconf/test_usage.py @@ -1,12 +1,12 @@ """Test Zeroconf multiple instance protection.""" +from unittest.mock import Mock, patch + import zeroconf from homeassistant.components.zeroconf import async_get_instance from homeassistant.components.zeroconf.usage import install_multiple_zeroconf_catcher from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, patch - DOMAIN = "zeroconf" diff --git a/tests/components/zerproc/test_config_flow.py b/tests/components/zerproc/test_config_flow.py index 1a607bb8c9c..53b90e0364e 100644 --- a/tests/components/zerproc/test_config_flow.py +++ b/tests/components/zerproc/test_config_flow.py @@ -1,11 +1,11 @@ """Test the zerproc config flow.""" +from unittest.mock import patch + import pyzerproc from homeassistant import config_entries, setup from homeassistant.components.zerproc.config_flow import DOMAIN -from tests.async_mock import patch - async def test_flow_success(hass): """Test we get the form.""" diff --git a/tests/components/zerproc/test_light.py b/tests/components/zerproc/test_light.py index 77fdfb7d48a..1f0c7652bfd 100644 --- a/tests/components/zerproc/test_light.py +++ b/tests/components/zerproc/test_light.py @@ -1,4 +1,6 @@ """Test the zerproc lights.""" +from unittest.mock import MagicMock, patch + import pytest import pyzerproc @@ -24,7 +26,6 @@ from homeassistant.const import ( ) import homeassistant.util.dt as dt_util -from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry, async_fire_time_changed diff --git a/tests/components/zha/common.py b/tests/components/zha/common.py index 249e1bf58b2..234ca0c9ba5 100644 --- a/tests/components/zha/common.py +++ b/tests/components/zha/common.py @@ -1,5 +1,6 @@ """Common test objects.""" import time +from unittest.mock import AsyncMock, Mock from zigpy.device import Device as zigpy_dev from zigpy.endpoint import Endpoint as zigpy_ep @@ -13,8 +14,6 @@ import zigpy.zdo.types import homeassistant.components.zha.core.const as zha_const from homeassistant.util import slugify -from tests.async_mock import AsyncMock, Mock - class FakeEndpoint: """Fake endpoint for moking zigpy.""" diff --git a/tests/components/zha/conftest.py b/tests/components/zha/conftest.py index 2a2ea6a1bb0..57241b9bb74 100644 --- a/tests/components/zha/conftest.py +++ b/tests/components/zha/conftest.py @@ -1,4 +1,6 @@ """Test configuration for the ZHA component.""" +from unittest.mock import AsyncMock, MagicMock, PropertyMock, patch + import pytest import zigpy from zigpy.application import ControllerApplication @@ -13,7 +15,6 @@ from homeassistant.setup import async_setup_component from .common import FakeDevice, FakeEndpoint, get_zha_gateway -from tests.async_mock import AsyncMock, MagicMock, PropertyMock, patch from tests.common import MockConfigEntry from tests.components.light.conftest import mock_light_profiles # noqa diff --git a/tests/components/zha/test_api.py b/tests/components/zha/test_api.py index 53861bc0d9a..363aa12db6e 100644 --- a/tests/components/zha/test_api.py +++ b/tests/components/zha/test_api.py @@ -1,5 +1,6 @@ """Test ZHA API.""" from binascii import unhexlify +from unittest.mock import AsyncMock, patch import pytest import voluptuous as vol @@ -41,8 +42,6 @@ from homeassistant.core import Context from .conftest import FIXTURE_GRP_ID, FIXTURE_GRP_NAME -from tests.async_mock import AsyncMock, patch - IEEE_SWITCH_DEVICE = "01:2d:6f:00:0a:90:69:e7" IEEE_GROUPABLE_DEVICE = "01:2d:6f:00:0a:90:69:e8" diff --git a/tests/components/zha/test_channels.py b/tests/components/zha/test_channels.py index e0c31d38bbb..8a2ca1f05c3 100644 --- a/tests/components/zha/test_channels.py +++ b/tests/components/zha/test_channels.py @@ -1,6 +1,7 @@ """Test ZHA Core channels.""" import asyncio from unittest import mock +from unittest.mock import AsyncMock, patch import pytest import zigpy.profiles.zha @@ -14,7 +15,6 @@ import homeassistant.components.zha.core.registries as registries from .common import get_zha_gateway, make_zcl_header -from tests.async_mock import AsyncMock, patch from tests.common import async_capture_events diff --git a/tests/components/zha/test_climate.py b/tests/components/zha/test_climate.py index cc152c1a36d..05412ddb64d 100644 --- a/tests/components/zha/test_climate.py +++ b/tests/components/zha/test_climate.py @@ -1,5 +1,7 @@ """Test zha climate.""" +from unittest.mock import patch + import pytest import zigpy.zcl.clusters from zigpy.zcl.clusters.hvac import Thermostat @@ -46,8 +48,6 @@ from homeassistant.const import ATTR_ENTITY_ID, ATTR_TEMPERATURE, STATE_UNKNOWN from .common import async_enable_traffic, find_entity_id, send_attributes_report -from tests.async_mock import patch - CLIMATE = { 1: { "device_type": zigpy.profiles.zha.DeviceType.THERMOSTAT, diff --git a/tests/components/zha/test_config_flow.py b/tests/components/zha/test_config_flow.py index 6fcc369182d..fe65def839d 100644 --- a/tests/components/zha/test_config_flow.py +++ b/tests/components/zha/test_config_flow.py @@ -1,6 +1,7 @@ """Tests for ZHA config flow.""" import os +from unittest.mock import AsyncMock, MagicMock, patch, sentinel import pytest import serial.tools.list_ports @@ -13,7 +14,6 @@ from homeassistant.config_entries import SOURCE_USER from homeassistant.const import CONF_SOURCE from homeassistant.data_entry_flow import RESULT_TYPE_CREATE_ENTRY, RESULT_TYPE_FORM -from tests.async_mock import AsyncMock, MagicMock, patch, sentinel from tests.common import MockConfigEntry diff --git a/tests/components/zha/test_cover.py b/tests/components/zha/test_cover.py index 97fa5c7579d..c926618813c 100644 --- a/tests/components/zha/test_cover.py +++ b/tests/components/zha/test_cover.py @@ -1,5 +1,6 @@ """Test zha cover.""" import asyncio +from unittest.mock import AsyncMock, patch import pytest import zigpy.profiles.zha @@ -32,7 +33,6 @@ from .common import ( send_attributes_report, ) -from tests.async_mock import AsyncMock, patch from tests.common import async_capture_events, mock_coro, mock_restore_cache diff --git a/tests/components/zha/test_device.py b/tests/components/zha/test_device.py index 1cc9fb27d89..1ce75045d38 100644 --- a/tests/components/zha/test_device.py +++ b/tests/components/zha/test_device.py @@ -2,6 +2,7 @@ from datetime import timedelta import time from unittest import mock +from unittest.mock import patch import pytest import zigpy.profiles.zha @@ -14,7 +15,6 @@ import homeassistant.util.dt as dt_util from .common import async_enable_traffic, make_zcl_header -from tests.async_mock import patch from tests.common import async_fire_time_changed diff --git a/tests/components/zha/test_discover.py b/tests/components/zha/test_discover.py index b5da98dc01f..ac2ef085e14 100644 --- a/tests/components/zha/test_discover.py +++ b/tests/components/zha/test_discover.py @@ -2,6 +2,7 @@ import re from unittest import mock +from unittest.mock import AsyncMock, patch import pytest import zigpy.profiles.zha @@ -30,8 +31,6 @@ import homeassistant.helpers.entity_registry from .common import get_zha_gateway from .zha_devices_list import DEVICES -from tests.async_mock import AsyncMock, patch - NO_TAIL_ID = re.compile("_\\d$") diff --git a/tests/components/zha/test_fan.py b/tests/components/zha/test_fan.py index 65be13fd96c..61828c135bc 100644 --- a/tests/components/zha/test_fan.py +++ b/tests/components/zha/test_fan.py @@ -1,4 +1,6 @@ """Test zha fan.""" +from unittest.mock import AsyncMock, call, patch + import pytest import zigpy.profiles.zha as zha import zigpy.zcl.clusters.general as general @@ -37,8 +39,6 @@ from .common import ( send_attributes_report, ) -from tests.async_mock import AsyncMock, call, patch - IEEE_GROUPABLE_DEVICE = "01:2d:6f:00:0a:90:69:e8" IEEE_GROUPABLE_DEVICE2 = "02:2d:6f:00:0a:90:69:e8" diff --git a/tests/components/zha/test_init.py b/tests/components/zha/test_init.py index f0b82231fa9..f259febd817 100644 --- a/tests/components/zha/test_init.py +++ b/tests/components/zha/test_init.py @@ -1,5 +1,7 @@ """Tests for ZHA integration init.""" +from unittest.mock import AsyncMock, patch + import pytest from zigpy.config import CONF_DEVICE, CONF_DEVICE_PATH @@ -12,7 +14,6 @@ from homeassistant.components.zha.core.const import ( from homeassistant.const import MAJOR_VERSION, MINOR_VERSION from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock, patch from tests.common import MockConfigEntry DATA_RADIO_TYPE = "deconz" diff --git a/tests/components/zha/test_light.py b/tests/components/zha/test_light.py index ea1b8487b7c..0a9a492a148 100644 --- a/tests/components/zha/test_light.py +++ b/tests/components/zha/test_light.py @@ -1,5 +1,6 @@ """Test zha light.""" from datetime import timedelta +from unittest.mock import AsyncMock, MagicMock, call, patch, sentinel import pytest import zigpy.profiles.zha as zha @@ -23,7 +24,6 @@ from .common import ( send_attributes_report, ) -from tests.async_mock import AsyncMock, MagicMock, call, patch, sentinel from tests.common import async_fire_time_changed ON = 1 diff --git a/tests/components/zha/test_number.py b/tests/components/zha/test_number.py index 947bad37e01..1bb9aa947ff 100644 --- a/tests/components/zha/test_number.py +++ b/tests/components/zha/test_number.py @@ -1,4 +1,6 @@ """Test zha analog output.""" +from unittest.mock import call, patch + import pytest import zigpy.profiles.zha import zigpy.types @@ -16,7 +18,6 @@ from .common import ( send_attributes_report, ) -from tests.async_mock import call, patch from tests.common import mock_coro diff --git a/tests/components/zodiac/test_sensor.py b/tests/components/zodiac/test_sensor.py index b08352dd2c0..6c784d3998f 100644 --- a/tests/components/zodiac/test_sensor.py +++ b/tests/components/zodiac/test_sensor.py @@ -1,5 +1,6 @@ """The test for the zodiac sensor platform.""" from datetime import datetime +from unittest.mock import patch import pytest @@ -19,8 +20,6 @@ from homeassistant.components.zodiac.const import ( from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch - DAY1 = datetime(2020, 11, 15, tzinfo=dt_util.UTC) DAY2 = datetime(2020, 4, 20, tzinfo=dt_util.UTC) DAY3 = datetime(2020, 4, 21, tzinfo=dt_util.UTC) diff --git a/tests/components/zone/test_init.py b/tests/components/zone/test_init.py index 994bd5e6dda..07fd83cbe77 100644 --- a/tests/components/zone/test_init.py +++ b/tests/components/zone/test_init.py @@ -1,4 +1,6 @@ """Test zone component.""" +from unittest.mock import patch + import pytest from homeassistant import setup @@ -15,7 +17,6 @@ from homeassistant.core import Context from homeassistant.exceptions import Unauthorized from homeassistant.helpers import entity_registry -from tests.async_mock import patch from tests.common import MockConfigEntry diff --git a/tests/components/zwave/conftest.py b/tests/components/zwave/conftest.py index 5366f028328..13da12c67ff 100644 --- a/tests/components/zwave/conftest.py +++ b/tests/components/zwave/conftest.py @@ -1,9 +1,10 @@ """Fixtures for Z-Wave tests.""" +from unittest.mock import AsyncMock, MagicMock, patch + import pytest from homeassistant.components.zwave import const -from tests.async_mock import AsyncMock, MagicMock, patch from tests.components.light.conftest import mock_light_profiles # noqa from tests.mock.zwave import MockNetwork, MockNode, MockOption, MockValue diff --git a/tests/components/zwave/test_binary_sensor.py b/tests/components/zwave/test_binary_sensor.py index 815563d2a5e..731e413caf8 100644 --- a/tests/components/zwave/test_binary_sensor.py +++ b/tests/components/zwave/test_binary_sensor.py @@ -1,9 +1,9 @@ """Test Z-Wave binary sensors.""" import datetime +from unittest.mock import patch from homeassistant.components.zwave import binary_sensor, const -from tests.async_mock import patch from tests.mock.zwave import MockEntityValues, MockNode, MockValue, value_changed diff --git a/tests/components/zwave/test_cover.py b/tests/components/zwave/test_cover.py index cde0957e2b3..e8b784feefe 100644 --- a/tests/components/zwave/test_cover.py +++ b/tests/components/zwave/test_cover.py @@ -1,4 +1,6 @@ """Test Z-Wave cover devices.""" +from unittest.mock import MagicMock + from homeassistant.components.cover import SUPPORT_CLOSE, SUPPORT_OPEN from homeassistant.components.zwave import ( CONF_INVERT_OPENCLOSE_BUTTONS, @@ -7,7 +9,6 @@ from homeassistant.components.zwave import ( cover, ) -from tests.async_mock import MagicMock from tests.mock.zwave import MockEntityValues, MockNode, MockValue, value_changed diff --git a/tests/components/zwave/test_init.py b/tests/components/zwave/test_init.py index 5f408518271..d70c3d631d5 100644 --- a/tests/components/zwave/test_init.py +++ b/tests/components/zwave/test_init.py @@ -2,6 +2,7 @@ import asyncio from collections import OrderedDict from datetime import datetime +from unittest.mock import MagicMock, patch import pytest from pytz import utc @@ -20,7 +21,6 @@ from homeassistant.const import ATTR_ENTITY_ID from homeassistant.helpers.device_registry import async_get_registry as get_dev_reg from homeassistant.helpers.entity_registry import async_get_registry -from tests.async_mock import MagicMock, patch from tests.common import async_fire_time_changed, mock_registry from tests.mock.zwave import MockEntityValues, MockNetwork, MockNode, MockValue diff --git a/tests/components/zwave/test_light.py b/tests/components/zwave/test_light.py index 1b973294daf..9e943c54bb4 100644 --- a/tests/components/zwave/test_light.py +++ b/tests/components/zwave/test_light.py @@ -1,4 +1,6 @@ """Test Z-Wave lights.""" +from unittest.mock import MagicMock, patch + from homeassistant.components import zwave from homeassistant.components.light import ( ATTR_BRIGHTNESS, @@ -14,7 +16,6 @@ from homeassistant.components.light import ( ) from homeassistant.components.zwave import const, light -from tests.async_mock import MagicMock, patch from tests.mock.zwave import MockEntityValues, MockNode, MockValue, value_changed diff --git a/tests/components/zwave/test_lock.py b/tests/components/zwave/test_lock.py index 2f82bcb2764..d5b6d0a0d27 100644 --- a/tests/components/zwave/test_lock.py +++ b/tests/components/zwave/test_lock.py @@ -1,8 +1,9 @@ """Test Z-Wave locks.""" +from unittest.mock import MagicMock, patch + from homeassistant import config_entries from homeassistant.components.zwave import const, lock -from tests.async_mock import MagicMock, patch from tests.mock.zwave import MockEntityValues, MockNode, MockValue, value_changed diff --git a/tests/components/zwave/test_node_entity.py b/tests/components/zwave/test_node_entity.py index 29c1126b5d1..ba77aabc923 100644 --- a/tests/components/zwave/test_node_entity.py +++ b/tests/components/zwave/test_node_entity.py @@ -1,8 +1,9 @@ """Test Z-Wave node entity.""" +from unittest.mock import MagicMock, patch + from homeassistant.components.zwave import const, node_entity from homeassistant.const import ATTR_ENTITY_ID -from tests.async_mock import MagicMock, patch import tests.mock.zwave as mock_zwave diff --git a/tests/components/zwave/test_switch.py b/tests/components/zwave/test_switch.py index b61c456ccb9..4293a4a23fd 100644 --- a/tests/components/zwave/test_switch.py +++ b/tests/components/zwave/test_switch.py @@ -1,7 +1,8 @@ """Test Z-Wave switches.""" +from unittest.mock import patch + from homeassistant.components.zwave import switch -from tests.async_mock import patch from tests.mock.zwave import MockEntityValues, MockNode, MockValue, value_changed diff --git a/tests/conftest.py b/tests/conftest.py index d8fb9f2914b..55249a58fc9 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -5,6 +5,7 @@ import functools import logging import ssl import threading +from unittest.mock import MagicMock, patch from aiohttp.test_utils import make_mocked_request import multidict @@ -27,7 +28,6 @@ from homeassistant.helpers import config_entry_oauth2_flow, event from homeassistant.setup import async_setup_component from homeassistant.util import location -from tests.async_mock import MagicMock, patch from tests.ignore_uncaught_exceptions import IGNORE_UNCAUGHT_EXCEPTIONS pytest.register_assert_rewrite("tests.common") diff --git a/tests/helpers/test_aiohttp_client.py b/tests/helpers/test_aiohttp_client.py index 0f37ebd7b3b..e6f113c7699 100644 --- a/tests/helpers/test_aiohttp_client.py +++ b/tests/helpers/test_aiohttp_client.py @@ -1,5 +1,6 @@ """Test the aiohttp client helper.""" import asyncio +from unittest.mock import Mock, patch import aiohttp import pytest @@ -8,8 +9,6 @@ from homeassistant.core import EVENT_HOMEASSISTANT_CLOSE import homeassistant.helpers.aiohttp_client as client from homeassistant.setup import async_setup_component -from tests.async_mock import Mock, patch - @pytest.fixture(name="camera_client") def camera_client_fixture(hass, hass_client): diff --git a/tests/helpers/test_area_registry.py b/tests/helpers/test_area_registry.py index 4b6ca7da3fe..ec008dde7da 100644 --- a/tests/helpers/test_area_registry.py +++ b/tests/helpers/test_area_registry.py @@ -1,12 +1,12 @@ """Tests for the Area Registry.""" import asyncio +import unittest.mock import pytest from homeassistant.core import callback from homeassistant.helpers import area_registry -import tests.async_mock from tests.common import flush_store, mock_area_registry @@ -178,7 +178,7 @@ async def test_loading_area_from_storage(hass, hass_storage): async def test_loading_race_condition(hass): """Test only one storage load called when concurrent loading occurred .""" - with tests.async_mock.patch( + with unittest.mock.patch( "homeassistant.helpers.area_registry.AreaRegistry.async_load" ) as mock_load: results = await asyncio.gather( diff --git a/tests/helpers/test_check_config.py b/tests/helpers/test_check_config.py index 7959cf66403..c5b75b84342 100644 --- a/tests/helpers/test_check_config.py +++ b/tests/helpers/test_check_config.py @@ -1,5 +1,6 @@ """Test check_config helper.""" import logging +from unittest.mock import Mock, patch from homeassistant.config import YAML_CONFIG_FILE from homeassistant.helpers.check_config import ( @@ -7,7 +8,6 @@ from homeassistant.helpers.check_config import ( async_check_ha_config_file, ) -from tests.async_mock import Mock, patch from tests.common import mock_platform, patch_yaml_files _LOGGER = logging.getLogger(__name__) diff --git a/tests/helpers/test_condition.py b/tests/helpers/test_condition.py index 802ad7699e3..fe2a9aa4406 100644 --- a/tests/helpers/test_condition.py +++ b/tests/helpers/test_condition.py @@ -1,5 +1,6 @@ """Test the condition helper.""" from logging import ERROR +from unittest.mock import patch import pytest @@ -9,8 +10,6 @@ from homeassistant.helpers.template import Template from homeassistant.setup import async_setup_component from homeassistant.util import dt -from tests.async_mock import patch - async def test_invalid_condition(hass): """Test if invalid condition raises.""" diff --git a/tests/helpers/test_config_entry_flow.py b/tests/helpers/test_config_entry_flow.py index 926aa98e308..a70f6ad8d5c 100644 --- a/tests/helpers/test_config_entry_flow.py +++ b/tests/helpers/test_config_entry_flow.py @@ -1,11 +1,12 @@ """Tests for the Config Entry Flow helper.""" +from unittest.mock import Mock, patch + import pytest from homeassistant import config_entries, data_entry_flow, setup from homeassistant.config import async_process_ha_core_config from homeassistant.helpers import config_entry_flow -from tests.async_mock import Mock, patch from tests.common import ( MockConfigEntry, MockModule, diff --git a/tests/helpers/test_config_entry_oauth2_flow.py b/tests/helpers/test_config_entry_oauth2_flow.py index f2f2db37d7f..617c4690696 100644 --- a/tests/helpers/test_config_entry_oauth2_flow.py +++ b/tests/helpers/test_config_entry_oauth2_flow.py @@ -2,6 +2,7 @@ import asyncio import logging import time +from unittest.mock import patch import aiohttp import pytest @@ -10,7 +11,6 @@ from homeassistant import config_entries, data_entry_flow, setup from homeassistant.helpers import config_entry_oauth2_flow from homeassistant.helpers.network import NoURLAvailableError -from tests.async_mock import patch from tests.common import MockConfigEntry, mock_platform TEST_DOMAIN = "oauth2_test" diff --git a/tests/helpers/test_config_validation.py b/tests/helpers/test_config_validation.py index 5d907408b61..1397e499c7e 100644 --- a/tests/helpers/test_config_validation.py +++ b/tests/helpers/test_config_validation.py @@ -3,6 +3,7 @@ from datetime import date, datetime, timedelta import enum import os from socket import _GLOBAL_DEFAULT_TIMEOUT +from unittest.mock import Mock, patch import uuid import pytest @@ -11,8 +12,6 @@ import voluptuous as vol import homeassistant from homeassistant.helpers import config_validation as cv, template -from tests.async_mock import Mock, patch - def test_boolean(): """Test boolean validation.""" diff --git a/tests/helpers/test_debounce.py b/tests/helpers/test_debounce.py index e9cb5749eaf..cdced565e73 100644 --- a/tests/helpers/test_debounce.py +++ b/tests/helpers/test_debounce.py @@ -1,7 +1,7 @@ """Tests for debounce.""" -from homeassistant.helpers import debounce +from unittest.mock import AsyncMock -from tests.async_mock import AsyncMock +from homeassistant.helpers import debounce async def test_immediate_works(hass): diff --git a/tests/helpers/test_deprecation.py b/tests/helpers/test_deprecation.py index c7e903f7b16..38410c3bf0f 100644 --- a/tests/helpers/test_deprecation.py +++ b/tests/helpers/test_deprecation.py @@ -1,7 +1,7 @@ """Test deprecation helpers.""" -from homeassistant.helpers.deprecation import deprecated_substitute, get_deprecated +from unittest.mock import MagicMock, patch -from tests.async_mock import MagicMock, patch +from homeassistant.helpers.deprecation import deprecated_substitute, get_deprecated class MockBaseClass: diff --git a/tests/helpers/test_device_registry.py b/tests/helpers/test_device_registry.py index 7fa787e023e..7f15239556d 100644 --- a/tests/helpers/test_device_registry.py +++ b/tests/helpers/test_device_registry.py @@ -1,5 +1,6 @@ """Tests for the Device Registry.""" import asyncio +from unittest.mock import patch import pytest @@ -7,7 +8,6 @@ from homeassistant.const import EVENT_HOMEASSISTANT_STARTED from homeassistant.core import CoreState, callback from homeassistant.helpers import device_registry, entity_registry -from tests.async_mock import patch from tests.common import MockConfigEntry, flush_store, mock_device_registry diff --git a/tests/helpers/test_entity.py b/tests/helpers/test_entity.py index 15e9bf55aa4..52149b060e4 100644 --- a/tests/helpers/test_entity.py +++ b/tests/helpers/test_entity.py @@ -3,6 +3,7 @@ import asyncio from datetime import timedelta import threading +from unittest.mock import MagicMock, PropertyMock, patch import pytest @@ -10,7 +11,6 @@ from homeassistant.const import ATTR_DEVICE_CLASS, STATE_UNAVAILABLE from homeassistant.core import Context from homeassistant.helpers import entity, entity_registry -from tests.async_mock import MagicMock, PropertyMock, patch from tests.common import ( MockConfigEntry, MockEntity, diff --git a/tests/helpers/test_entity_component.py b/tests/helpers/test_entity_component.py index 0373705186f..8d61ec7d509 100644 --- a/tests/helpers/test_entity_component.py +++ b/tests/helpers/test_entity_component.py @@ -3,6 +3,7 @@ from collections import OrderedDict from datetime import timedelta import logging +from unittest.mock import AsyncMock, Mock, patch import pytest import voluptuous as vol @@ -15,7 +16,6 @@ from homeassistant.helpers.entity_component import EntityComponent from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import AsyncMock, Mock, patch from tests.common import ( MockConfigEntry, MockEntity, diff --git a/tests/helpers/test_entity_platform.py b/tests/helpers/test_entity_platform.py index d12c574d1a9..25d105ab549 100644 --- a/tests/helpers/test_entity_platform.py +++ b/tests/helpers/test_entity_platform.py @@ -2,6 +2,7 @@ import asyncio from datetime import timedelta import logging +from unittest.mock import Mock, patch import pytest @@ -16,7 +17,6 @@ from homeassistant.helpers.entity_component import ( ) import homeassistant.util.dt as dt_util -from tests.async_mock import Mock, patch from tests.common import ( MockConfigEntry, MockEntity, diff --git a/tests/helpers/test_entity_registry.py b/tests/helpers/test_entity_registry.py index 19af3715160..21f4392122e 100644 --- a/tests/helpers/test_entity_registry.py +++ b/tests/helpers/test_entity_registry.py @@ -1,5 +1,7 @@ """Tests for the Entity Registry.""" import asyncio +import unittest.mock +from unittest.mock import patch import pytest @@ -7,8 +9,6 @@ from homeassistant.const import EVENT_HOMEASSISTANT_START, STATE_UNAVAILABLE from homeassistant.core import CoreState, callback, valid_entity_id from homeassistant.helpers import entity_registry -import tests.async_mock -from tests.async_mock import patch from tests.common import ( MockConfigEntry, flush_store, @@ -429,7 +429,7 @@ async def test_loading_invalid_entity_id(hass, hass_storage): async def test_loading_race_condition(hass): """Test only one storage load called when concurrent loading occurred .""" - with tests.async_mock.patch( + with unittest.mock.patch( "homeassistant.helpers.entity_registry.EntityRegistry.async_load" ) as mock_load: results = await asyncio.gather( diff --git a/tests/helpers/test_event.py b/tests/helpers/test_event.py index 9c7ddb09f85..b0f58f76a66 100644 --- a/tests/helpers/test_event.py +++ b/tests/helpers/test_event.py @@ -2,6 +2,7 @@ # pylint: disable=protected-access import asyncio from datetime import datetime, timedelta +from unittest.mock import patch from astral import Astral import jinja2 @@ -39,7 +40,6 @@ from homeassistant.helpers.template import Template from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import async_fire_time_changed DEFAULT_TIME_ZONE = dt_util.DEFAULT_TIME_ZONE diff --git a/tests/helpers/test_frame.py b/tests/helpers/test_frame.py index 6daae51403c..7fc46b3699d 100644 --- a/tests/helpers/test_frame.py +++ b/tests/helpers/test_frame.py @@ -1,10 +1,10 @@ """Test the frame helper.""" +from unittest.mock import Mock, patch + import pytest from homeassistant.helpers import frame -from tests.async_mock import Mock, patch - async def test_extract_frame_integration(caplog): """Test extracting the current frame from integration context.""" diff --git a/tests/helpers/test_httpx_client.py b/tests/helpers/test_httpx_client.py index 5444cd4643d..53a6985f5cc 100644 --- a/tests/helpers/test_httpx_client.py +++ b/tests/helpers/test_httpx_client.py @@ -1,13 +1,13 @@ """Test the httpx client helper.""" +from unittest.mock import Mock, patch + import httpx import pytest from homeassistant.core import EVENT_HOMEASSISTANT_CLOSE import homeassistant.helpers.httpx_client as client -from tests.async_mock import Mock, patch - async def test_get_async_client_with_ssl(hass): """Test init async client with ssl.""" diff --git a/tests/helpers/test_instance_id.py b/tests/helpers/test_instance_id.py index 36e87b31a43..c8417c519a1 100644 --- a/tests/helpers/test_instance_id.py +++ b/tests/helpers/test_instance_id.py @@ -1,5 +1,5 @@ """Tests for instance ID helper.""" -from tests.async_mock import patch +from unittest.mock import patch async def test_get_id_empty(hass, hass_storage): diff --git a/tests/helpers/test_integration_platform.py b/tests/helpers/test_integration_platform.py index 6f0e56d34c8..d6c844c0d91 100644 --- a/tests/helpers/test_integration_platform.py +++ b/tests/helpers/test_integration_platform.py @@ -1,7 +1,8 @@ """Test integration platform helpers.""" +from unittest.mock import Mock + from homeassistant.setup import ATTR_COMPONENT, EVENT_COMPONENT_LOADED -from tests.async_mock import Mock from tests.common import mock_platform diff --git a/tests/helpers/test_network.py b/tests/helpers/test_network.py index 3330c42d9fc..06158558d5e 100644 --- a/tests/helpers/test_network.py +++ b/tests/helpers/test_network.py @@ -1,4 +1,6 @@ """Test network helper.""" +from unittest.mock import Mock, patch + import pytest from homeassistant.components import cloud @@ -15,7 +17,6 @@ from homeassistant.helpers.network import ( is_internal_request, ) -from tests.async_mock import Mock, patch from tests.common import mock_component diff --git a/tests/helpers/test_reload.py b/tests/helpers/test_reload.py index 3ed8d17b3f4..b4f47fa65b1 100644 --- a/tests/helpers/test_reload.py +++ b/tests/helpers/test_reload.py @@ -1,6 +1,7 @@ """Tests for the reload helper.""" import logging from os import path +from unittest.mock import AsyncMock, Mock, patch import pytest @@ -16,7 +17,6 @@ from homeassistant.helpers.reload import ( ) from homeassistant.loader import async_get_integration -from tests.async_mock import AsyncMock, Mock, patch from tests.common import ( MockModule, MockPlatform, diff --git a/tests/helpers/test_restore_state.py b/tests/helpers/test_restore_state.py index 15eed1c7e19..1a2fb2f57b5 100644 --- a/tests/helpers/test_restore_state.py +++ b/tests/helpers/test_restore_state.py @@ -1,5 +1,6 @@ """The tests for the Restore component.""" from datetime import datetime +from unittest.mock import patch from homeassistant.const import EVENT_HOMEASSISTANT_START from homeassistant.core import CoreState, State @@ -14,8 +15,6 @@ from homeassistant.helpers.restore_state import ( ) from homeassistant.util import dt as dt_util -from tests.async_mock import patch - async def test_caching_data(hass): """Test that we cache data.""" diff --git a/tests/helpers/test_script.py b/tests/helpers/test_script.py index c81ed681d42..5be5f6bc91f 100644 --- a/tests/helpers/test_script.py +++ b/tests/helpers/test_script.py @@ -6,6 +6,7 @@ from datetime import timedelta import logging from types import MappingProxyType from unittest import mock +from unittest.mock import patch import pytest import voluptuous as vol @@ -19,7 +20,6 @@ from homeassistant.helpers import config_validation as cv, script from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import ( async_capture_events, async_fire_time_changed, diff --git a/tests/helpers/test_service.py b/tests/helpers/test_service.py index a75593ddd40..95ccdc84395 100644 --- a/tests/helpers/test_service.py +++ b/tests/helpers/test_service.py @@ -2,6 +2,7 @@ from collections import OrderedDict from copy import deepcopy import unittest +from unittest.mock import AsyncMock, Mock, patch import pytest import voluptuous as vol @@ -26,7 +27,6 @@ from homeassistant.helpers import ( import homeassistant.helpers.config_validation as cv from homeassistant.setup import async_setup_component -from tests.async_mock import AsyncMock, Mock, patch from tests.common import ( MockEntity, get_test_home_assistant, diff --git a/tests/helpers/test_singleton.py b/tests/helpers/test_singleton.py index 03230a02ab8..c695efd94a8 100644 --- a/tests/helpers/test_singleton.py +++ b/tests/helpers/test_singleton.py @@ -1,10 +1,10 @@ """Test singleton helper.""" +from unittest.mock import Mock + import pytest from homeassistant.helpers import singleton -from tests.async_mock import Mock - @pytest.fixture def mock_hass(): diff --git a/tests/helpers/test_state.py b/tests/helpers/test_state.py index 626f8a83744..89b0f3c6850 100644 --- a/tests/helpers/test_state.py +++ b/tests/helpers/test_state.py @@ -1,6 +1,7 @@ """Test state helpers.""" import asyncio from datetime import timedelta +from unittest.mock import patch import pytest @@ -21,7 +22,6 @@ import homeassistant.core as ha from homeassistant.helpers import state from homeassistant.util import dt as dt_util -from tests.async_mock import patch from tests.common import async_mock_service diff --git a/tests/helpers/test_storage.py b/tests/helpers/test_storage.py index 7fa6dd61845..61bf9fa8d0e 100644 --- a/tests/helpers/test_storage.py +++ b/tests/helpers/test_storage.py @@ -2,6 +2,7 @@ import asyncio from datetime import timedelta import json +from unittest.mock import Mock, patch import pytest @@ -13,7 +14,6 @@ from homeassistant.core import CoreState from homeassistant.helpers import storage from homeassistant.util import dt -from tests.async_mock import Mock, patch from tests.common import async_fire_time_changed MOCK_VERSION = 1 diff --git a/tests/helpers/test_storage_remove.py b/tests/helpers/test_storage_remove.py index 9a447771ea6..aa118aded59 100644 --- a/tests/helpers/test_storage_remove.py +++ b/tests/helpers/test_storage_remove.py @@ -2,11 +2,11 @@ import asyncio from datetime import timedelta import os +from unittest.mock import patch from homeassistant.helpers import storage from homeassistant.util import dt -from tests.async_mock import patch from tests.common import async_fire_time_changed, async_test_home_assistant diff --git a/tests/helpers/test_sun.py b/tests/helpers/test_sun.py index a877c7cdb00..b8ecd1ed86a 100644 --- a/tests/helpers/test_sun.py +++ b/tests/helpers/test_sun.py @@ -1,13 +1,12 @@ """The tests for the Sun helpers.""" # pylint: disable=protected-access from datetime import datetime, timedelta +from unittest.mock import patch from homeassistant.const import SUN_EVENT_SUNRISE, SUN_EVENT_SUNSET import homeassistant.helpers.sun as sun import homeassistant.util.dt as dt_util -from tests.async_mock import patch - def test_next_events(hass): """Test retrieving next sun events.""" diff --git a/tests/helpers/test_template.py b/tests/helpers/test_template.py index c8a8bc0710c..174d61ea470 100644 --- a/tests/helpers/test_template.py +++ b/tests/helpers/test_template.py @@ -2,6 +2,7 @@ from datetime import datetime import math import random +from unittest.mock import patch import pytest import pytz @@ -23,8 +24,6 @@ from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util from homeassistant.util.unit_system import UnitSystem -from tests.async_mock import patch - def _set_up_units(hass): """Set up the tests.""" diff --git a/tests/helpers/test_translation.py b/tests/helpers/test_translation.py index e8c5c756d59..8f555914682 100644 --- a/tests/helpers/test_translation.py +++ b/tests/helpers/test_translation.py @@ -2,6 +2,7 @@ import asyncio from os import path import pathlib +from unittest.mock import Mock, patch import pytest @@ -10,8 +11,6 @@ from homeassistant.helpers import translation from homeassistant.loader import async_get_integration from homeassistant.setup import async_setup_component, setup_component -from tests.async_mock import Mock, patch - @pytest.fixture def mock_config_flows(): diff --git a/tests/helpers/test_update_coordinator.py b/tests/helpers/test_update_coordinator.py index 90567456bfb..0651a4a9324 100644 --- a/tests/helpers/test_update_coordinator.py +++ b/tests/helpers/test_update_coordinator.py @@ -2,6 +2,7 @@ import asyncio from datetime import timedelta import logging +from unittest.mock import AsyncMock, Mock, patch import urllib.error import aiohttp @@ -11,7 +12,6 @@ import requests from homeassistant.helpers import update_coordinator from homeassistant.util.dt import utcnow -from tests.async_mock import AsyncMock, Mock, patch from tests.common import async_fire_time_changed _LOGGER = logging.getLogger(__name__) diff --git a/tests/mock/zwave.py b/tests/mock/zwave.py index 41c0aa5727b..5565b43a78e 100644 --- a/tests/mock/zwave.py +++ b/tests/mock/zwave.py @@ -1,7 +1,7 @@ """Mock helpers for Z-Wave component.""" -from pydispatch import dispatcher +from unittest.mock import MagicMock -from tests.async_mock import MagicMock +from pydispatch import dispatcher def value_changed(value): diff --git a/tests/scripts/test_auth.py b/tests/scripts/test_auth.py index c9ada99dc29..3ab19450879 100644 --- a/tests/scripts/test_auth.py +++ b/tests/scripts/test_auth.py @@ -1,10 +1,11 @@ """Test the auth script to manage local users.""" +from unittest.mock import Mock, patch + import pytest from homeassistant.auth.providers import homeassistant as hass_auth from homeassistant.scripts import auth as script_auth -from tests.async_mock import Mock, patch from tests.common import register_auth_provider diff --git a/tests/scripts/test_check_config.py b/tests/scripts/test_check_config.py index 10034cb08af..6eaaee87af0 100644 --- a/tests/scripts/test_check_config.py +++ b/tests/scripts/test_check_config.py @@ -1,12 +1,12 @@ """Test check_config script.""" import logging +from unittest.mock import patch import pytest from homeassistant.config import YAML_CONFIG_FILE import homeassistant.scripts.check_config as check_config -from tests.async_mock import patch from tests.common import get_test_config_dir, patch_yaml_files _LOGGER = logging.getLogger(__name__) diff --git a/tests/scripts/test_init.py b/tests/scripts/test_init.py index 2c14bfdcf0a..8feef2d3384 100644 --- a/tests/scripts/test_init.py +++ b/tests/scripts/test_init.py @@ -1,7 +1,7 @@ """Test script init.""" -import homeassistant.scripts as scripts +from unittest.mock import patch -from tests.async_mock import patch +import homeassistant.scripts as scripts @patch("homeassistant.scripts.get_default_config_dir", return_value="/default") diff --git a/tests/test_bootstrap.py b/tests/test_bootstrap.py index ed31724b58b..fc653c25d0b 100644 --- a/tests/test_bootstrap.py +++ b/tests/test_bootstrap.py @@ -2,7 +2,7 @@ # pylint: disable=protected-access import asyncio import os -from unittest.mock import Mock +from unittest.mock import Mock, patch import pytest @@ -11,7 +11,6 @@ import homeassistant.config as config_util from homeassistant.exceptions import HomeAssistantError import homeassistant.util.dt as dt_util -from tests.async_mock import patch from tests.common import ( MockModule, MockPlatform, diff --git a/tests/test_config.py b/tests/test_config.py index 931b672d01b..7dd7d61e8ef 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -4,6 +4,7 @@ from collections import OrderedDict import copy import os from unittest import mock +from unittest.mock import AsyncMock, Mock, patch import pytest import voluptuous as vol @@ -34,7 +35,6 @@ from homeassistant.loader import async_get_integration from homeassistant.util import dt as dt_util from homeassistant.util.yaml import SECRET_YAML -from tests.async_mock import AsyncMock, Mock, patch from tests.common import get_test_config_dir, patch_yaml_files CONFIG_DIR = get_test_config_dir() diff --git a/tests/test_config_entries.py b/tests/test_config_entries.py index 0be89af4810..a048f5a7043 100644 --- a/tests/test_config_entries.py +++ b/tests/test_config_entries.py @@ -1,6 +1,7 @@ """Test the config manager.""" import asyncio from datetime import timedelta +from unittest.mock import AsyncMock, patch import pytest @@ -10,7 +11,6 @@ from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.setup import async_setup_component from homeassistant.util import dt -from tests.async_mock import AsyncMock, patch from tests.common import ( MockConfigEntry, MockEntity, diff --git a/tests/test_core.py b/tests/test_core.py index 541f75e6343..dbed2b8c0bf 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -6,6 +6,7 @@ import functools import logging import os from tempfile import TemporaryDirectory +from unittest.mock import MagicMock, Mock, PropertyMock, patch import pytest import pytz @@ -40,7 +41,6 @@ from homeassistant.exceptions import ( import homeassistant.util.dt as dt_util from homeassistant.util.unit_system import METRIC_SYSTEM -from tests.async_mock import MagicMock, Mock, PropertyMock, patch from tests.common import async_capture_events, async_mock_service PST = pytz.timezone("America/Los_Angeles") diff --git a/tests/test_loader.py b/tests/test_loader.py index 64c8c5764cf..00c6e2b0c20 100644 --- a/tests/test_loader.py +++ b/tests/test_loader.py @@ -1,11 +1,12 @@ """Test to verify that we can load components.""" +from unittest.mock import ANY, patch + import pytest from homeassistant import core, loader from homeassistant.components import http, hue from homeassistant.components.hue import light as hue_light -from tests.async_mock import ANY, patch from tests.common import MockModule, async_mock_service, mock_integration diff --git a/tests/test_main.py b/tests/test_main.py index 40c34b77b50..5ec6460301f 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -1,9 +1,9 @@ """Test methods in __main__.""" +from unittest.mock import PropertyMock, patch + from homeassistant import __main__ as main from homeassistant.const import REQUIRED_PYTHON_VER -from tests.async_mock import PropertyMock, patch - @patch("sys.exit") def test_validate_python(mock_exit): diff --git a/tests/test_requirements.py b/tests/test_requirements.py index c0a1f0723ac..bc206a136c2 100644 --- a/tests/test_requirements.py +++ b/tests/test_requirements.py @@ -1,5 +1,6 @@ """Test requirements module.""" import os +from unittest.mock import call, patch import pytest @@ -11,7 +12,6 @@ from homeassistant.requirements import ( async_process_requirements, ) -from tests.async_mock import call, patch from tests.common import MockModule, mock_integration diff --git a/tests/test_setup.py b/tests/test_setup.py index ebcb1093779..539ed3f1442 100644 --- a/tests/test_setup.py +++ b/tests/test_setup.py @@ -3,6 +3,7 @@ import asyncio import os import threading +from unittest.mock import Mock, patch import pytest import voluptuous as vol @@ -18,7 +19,6 @@ from homeassistant.helpers.config_validation import ( ) import homeassistant.util.dt as dt_util -from tests.async_mock import Mock, patch from tests.common import ( MockConfigEntry, MockModule, diff --git a/tests/util/test_async.py b/tests/util/test_async.py index 047697168b4..db088ada93e 100644 --- a/tests/util/test_async.py +++ b/tests/util/test_async.py @@ -1,13 +1,12 @@ """Tests for async util methods from Python source.""" import asyncio import time +from unittest.mock import MagicMock, Mock, patch import pytest from homeassistant.util import async_ as hasync -from tests.async_mock import MagicMock, Mock, patch - @patch("asyncio.coroutines.iscoroutine") @patch("concurrent.futures.Future") diff --git a/tests/util/test_init.py b/tests/util/test_init.py index ef5ecd898d7..2ffca07082b 100644 --- a/tests/util/test_init.py +++ b/tests/util/test_init.py @@ -1,13 +1,12 @@ """Test Home Assistant util methods.""" from datetime import datetime, timedelta +from unittest.mock import MagicMock, patch import pytest from homeassistant import util import homeassistant.util.dt as dt_util -from tests.async_mock import MagicMock, patch - def test_sanitize_filename(): """Test sanitize_filename.""" diff --git a/tests/util/test_json.py b/tests/util/test_json.py index af858967150..1cbaaae7d23 100644 --- a/tests/util/test_json.py +++ b/tests/util/test_json.py @@ -7,6 +7,7 @@ import os import sys from tempfile import mkdtemp import unittest +from unittest.mock import Mock import pytest @@ -19,8 +20,6 @@ from homeassistant.util.json import ( save_json, ) -from tests.async_mock import Mock - # Test data that can be saved as JSON TEST_JSON_A = {"a": 1, "B": "two"} TEST_JSON_B = {"a": "one", "B": 2} diff --git a/tests/util/test_location.py b/tests/util/test_location.py index 403e24121ad..9eb2dc70561 100644 --- a/tests/util/test_location.py +++ b/tests/util/test_location.py @@ -1,10 +1,11 @@ """Test Home Assistant location util methods.""" +from unittest.mock import Mock, patch + import aiohttp import pytest import homeassistant.util.location as location_util -from tests.async_mock import Mock, patch from tests.common import load_fixture # Paris diff --git a/tests/util/test_logging.py b/tests/util/test_logging.py index 04d6f133381..1a82c35e82d 100644 --- a/tests/util/test_logging.py +++ b/tests/util/test_logging.py @@ -2,13 +2,12 @@ import asyncio import logging import queue +from unittest.mock import patch import pytest import homeassistant.util.logging as logging_util -from tests.async_mock import patch - def test_sensitive_data_filter(): """Test the logging sensitive data filter.""" diff --git a/tests/util/test_package.py b/tests/util/test_package.py index 064d1379e08..0c251662444 100644 --- a/tests/util/test_package.py +++ b/tests/util/test_package.py @@ -4,14 +4,13 @@ import logging import os from subprocess import PIPE import sys +from unittest.mock import MagicMock, call, patch import pkg_resources import pytest import homeassistant.util.package as package -from tests.async_mock import MagicMock, call, patch - RESOURCE_DIR = os.path.abspath( os.path.join(os.path.dirname(__file__), "..", "resources") ) diff --git a/tests/util/yaml/test_init.py b/tests/util/yaml/test_init.py index 1c5b9bd9fd8..34097287bc3 100644 --- a/tests/util/yaml/test_init.py +++ b/tests/util/yaml/test_init.py @@ -3,6 +3,7 @@ import io import logging import os import unittest +from unittest.mock import patch import pytest @@ -11,7 +12,6 @@ from homeassistant.exceptions import HomeAssistantError import homeassistant.util.yaml as yaml from homeassistant.util.yaml import loader as yaml_loader -from tests.async_mock import patch from tests.common import get_test_config_dir, patch_yaml_files