From 4170eb0f83ee5fef11eef1b656d3aa4696c67b95 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Fri, 5 Jun 2020 01:59:55 -0700 Subject: [PATCH] Use builtin mock (#36473) --- tests/components/gogogate2/conftest.py | 3 ++- tests/components/marytts/test_tts.py | 3 +-- tests/components/seventeentrack/test_sensor.py | 12 ++++++------ tests/components/vera/common.py | 2 +- tests/components/vera/conftest.py | 3 ++- tests/components/vera/test_config_flow.py | 3 +-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/components/gogogate2/conftest.py b/tests/components/gogogate2/conftest.py index 6e2e58d8f9c..31e85c5f14e 100644 --- a/tests/components/gogogate2/conftest.py +++ b/tests/components/gogogate2/conftest.py @@ -1,12 +1,13 @@ """Fixtures for tests.""" -from mock import patch import pytest from homeassistant.core import HomeAssistant from .common import ComponentFactory +from tests.async_mock import patch + @pytest.fixture() def component_factory(hass: HomeAssistant): diff --git a/tests/components/marytts/test_tts.py b/tests/components/marytts/test_tts.py index 637ed1900b8..da221a7effd 100644 --- a/tests/components/marytts/test_tts.py +++ b/tests/components/marytts/test_tts.py @@ -4,8 +4,6 @@ import os import shutil from urllib.parse import urlencode -from mock import Mock, patch - from homeassistant.components.media_player.const import ( ATTR_MEDIA_CONTENT_ID, DOMAIN as DOMAIN_MP, @@ -16,6 +14,7 @@ from homeassistant.config import async_process_ha_core_config from homeassistant.const import HTTP_INTERNAL_SERVER_ERROR from homeassistant.setup import setup_component +from tests.async_mock import Mock, patch from tests.common import assert_setup_component, get_test_home_assistant, mock_service diff --git a/tests/components/seventeentrack/test_sensor.py b/tests/components/seventeentrack/test_sensor.py index 272f2fe7d76..330f4a66152 100644 --- a/tests/components/seventeentrack/test_sensor.py +++ b/tests/components/seventeentrack/test_sensor.py @@ -2,7 +2,6 @@ import datetime from typing import Union -import mock from py17track.package import Package import pytest @@ -14,6 +13,7 @@ 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 = { @@ -113,7 +113,7 @@ class ProfileMock: @pytest.fixture(autouse=True, name="mock_client") def fixture_mock_client(): """Mock py17track client.""" - with mock.patch( + with patch( "homeassistant.components.seventeentrack.sensor.SeventeenTrackClient", new=ClientMock, ): @@ -137,7 +137,7 @@ async def _goto_future(hass, future=None): """Move to future.""" if not future: future = utcnow() + datetime.timedelta(minutes=10) - with mock.patch("homeassistant.util.utcnow", return_value=future): + with patch("homeassistant.util.utcnow", return_value=future): async_fire_time_changed(hass, future) await hass.async_block_till_done() @@ -245,7 +245,7 @@ async def test_delivered_not_shown(hass): ) ProfileMock.package_list = [package] - hass.components.persistent_notification = mock.MagicMock() + hass.components.persistent_notification = MagicMock() await _setup_seventeentrack(hass, VALID_CONFIG_FULL_NO_DELIVERED) assert not hass.states.async_entity_ids() hass.components.persistent_notification.create.assert_called() @@ -258,7 +258,7 @@ async def test_delivered_shown(hass): ) ProfileMock.package_list = [package] - hass.components.persistent_notification = mock.MagicMock() + hass.components.persistent_notification = MagicMock() await _setup_seventeentrack(hass, VALID_CONFIG_FULL) assert hass.states.get("sensor.seventeentrack_package_456") is not None @@ -283,7 +283,7 @@ async def test_becomes_delivered_not_shown_notification(hass): ) ProfileMock.package_list = [package_delivered] - hass.components.persistent_notification = mock.MagicMock() + hass.components.persistent_notification = MagicMock() await _goto_future(hass) hass.components.persistent_notification.create.assert_called() diff --git a/tests/components/vera/common.py b/tests/components/vera/common.py index 5574c93c515..31e7c706ec9 100644 --- a/tests/components/vera/common.py +++ b/tests/components/vera/common.py @@ -2,13 +2,13 @@ from typing import Callable, Dict, NamedTuple, Tuple -from mock import MagicMock import pyvera as pv from homeassistant.components.vera.const import CONF_CONTROLLER, DOMAIN 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 2c15d3e4182..193c0733736 100644 --- a/tests/components/vera/conftest.py +++ b/tests/components/vera/conftest.py @@ -1,10 +1,11 @@ """Fixtures for tests.""" -from mock import patch import pytest from .common import ComponentFactory +from tests.async_mock import patch + @pytest.fixture() def vera_component_factory(): diff --git a/tests/components/vera/test_config_flow.py b/tests/components/vera/test_config_flow.py index 3915d4d0577..793e313125c 100644 --- a/tests/components/vera/test_config_flow.py +++ b/tests/components/vera/test_config_flow.py @@ -1,5 +1,4 @@ """Vera tests.""" -from mock import patch from requests.exceptions import RequestException from homeassistant import config_entries, data_entry_flow @@ -12,7 +11,7 @@ from homeassistant.data_entry_flow import ( RESULT_TYPE_FORM, ) -from tests.async_mock import MagicMock +from tests.async_mock import MagicMock, patch from tests.common import MockConfigEntry