From 6af30bc232a7139af3a334015f1f7b6d0eab9c3b Mon Sep 17 00:00:00 2001 From: springstan <46536646+springstan@users.noreply.github.com> Date: Fri, 6 Dec 2019 20:40:00 +0100 Subject: [PATCH] Move imports to top for notion (#29539) * Move imports to top for notion * Fix mocking library in test_config_flow.py --- homeassistant/components/notion/binary_sensor.py | 1 - homeassistant/components/notion/config_flow.py | 4 ++-- tests/components/notion/test_config_flow.py | 7 ++++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/homeassistant/components/notion/binary_sensor.py b/homeassistant/components/notion/binary_sensor.py index 85495c040fa..5079348e821 100644 --- a/homeassistant/components/notion/binary_sensor.py +++ b/homeassistant/components/notion/binary_sensor.py @@ -17,7 +17,6 @@ from . import ( SENSOR_WINDOW_HINGED_VERTICAL, NotionEntity, ) - from .const import DATA_CLIENT, DOMAIN _LOGGER = logging.getLogger(__name__) diff --git a/homeassistant/components/notion/config_flow.py b/homeassistant/components/notion/config_flow.py index affda29e4d6..2af231d582e 100644 --- a/homeassistant/components/notion/config_flow.py +++ b/homeassistant/components/notion/config_flow.py @@ -1,4 +1,6 @@ """Config flow to configure the Notion integration.""" +from aionotion import async_get_client +from aionotion.errors import NotionError import voluptuous as vol from homeassistant import config_entries @@ -40,8 +42,6 @@ class NotionFlowHandler(config_entries.ConfigFlow): async def async_step_user(self, user_input=None): """Handle the start of the config flow.""" - from aionotion import async_get_client - from aionotion.errors import NotionError if not user_input: return await self._show_form() diff --git a/tests/components/notion/test_config_flow.py b/tests/components/notion/test_config_flow.py index 42b28d2c0e1..aa942a8905d 100644 --- a/tests/components/notion/test_config_flow.py +++ b/tests/components/notion/test_config_flow.py @@ -1,12 +1,13 @@ """Define tests for the Notion config flow.""" import aionotion +from unittest.mock import patch import pytest from homeassistant import data_entry_flow from homeassistant.components.notion import DOMAIN, config_flow from homeassistant.const import CONF_PASSWORD, CONF_USERNAME -from tests.common import MockConfigEntry, MockDependency, mock_coro +from tests.common import MockConfigEntry, mock_coro @pytest.fixture @@ -18,8 +19,8 @@ def mock_client_coro(): @pytest.fixture def mock_aionotion(mock_client_coro): """Mock the aionotion library.""" - with MockDependency("aionotion") as mock_: - mock_.async_get_client.return_value = mock_client_coro + with patch("homeassistant.components.notion.config_flow.async_get_client") as mock_: + mock_.return_value = mock_client_coro yield mock_