diff --git a/homeassistant/components/directv/__init__.py b/homeassistant/components/directv/__init__.py index af27d19cfb0..59682178d40 100644 --- a/homeassistant/components/directv/__init__.py +++ b/homeassistant/components/directv/__init__.py @@ -4,9 +4,8 @@ from datetime import timedelta from typing import Any, Dict from directv import DIRECTV, DIRECTVError -import voluptuous as vol -from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry +from homeassistant.config_entries import ConfigEntry from homeassistant.const import ATTR_NAME, CONF_HOST from homeassistant.core import HomeAssistant from homeassistant.exceptions import ConfigEntryNotReady @@ -23,14 +22,7 @@ from .const import ( DOMAIN, ) -CONFIG_SCHEMA = vol.Schema( - { - DOMAIN: vol.All( - cv.ensure_list, [vol.Schema({vol.Required(CONF_HOST): cv.string})] - ) - }, - extra=vol.ALLOW_EXTRA, -) +CONFIG_SCHEMA = cv.deprecated(DOMAIN, invalidation_version="0.120") PLATFORMS = ["media_player", "remote"] SCAN_INTERVAL = timedelta(seconds=30) @@ -39,17 +31,6 @@ SCAN_INTERVAL = timedelta(seconds=30) async def async_setup(hass: HomeAssistant, config: Dict) -> bool: """Set up the DirecTV component.""" hass.data.setdefault(DOMAIN, {}) - - if DOMAIN in config: - for entry_config in config[DOMAIN]: - hass.async_create_task( - hass.config_entries.flow.async_init( - DOMAIN, - context={"source": SOURCE_IMPORT}, - data=entry_config, - ) - ) - return True diff --git a/homeassistant/components/directv/config_flow.py b/homeassistant/components/directv/config_flow.py index d84c3925ac4..cae0e62b1be 100644 --- a/homeassistant/components/directv/config_flow.py +++ b/homeassistant/components/directv/config_flow.py @@ -47,12 +47,6 @@ class DirecTVConfigFlow(ConfigFlow, domain=DOMAIN): """Set up the instance.""" self.discovery_info = {} - async def async_step_import( - self, user_input: Optional[ConfigType] = None - ) -> Dict[str, Any]: - """Handle a flow initiated by configuration file.""" - return await self.async_step_user(user_input) - async def async_step_user( self, user_input: Optional[ConfigType] = None ) -> Dict[str, Any]: diff --git a/tests/components/directv/test_config_flow.py b/tests/components/directv/test_config_flow.py index df3c606f687..09b76cfb550 100644 --- a/tests/components/directv/test_config_flow.py +++ b/tests/components/directv/test_config_flow.py @@ -3,7 +3,7 @@ from aiohttp import ClientError as HTTPClientError from homeassistant.components.directv.const import CONF_RECEIVER_ID, DOMAIN from homeassistant.components.ssdp import ATTR_UPNP_SERIAL -from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_SSDP, SOURCE_USER +from homeassistant.config_entries import SOURCE_SSDP, SOURCE_USER from homeassistant.const import CONF_HOST, CONF_NAME, CONF_SOURCE from homeassistant.data_entry_flow import ( RESULT_TYPE_ABORT, @@ -213,30 +213,6 @@ async def test_ssdp_confirm_unknown_error( assert result["reason"] == "unknown" -async def test_full_import_flow_implementation( - hass: HomeAssistantType, aioclient_mock: AiohttpClientMocker -) -> None: - """Test the full manual user flow from start to finish.""" - mock_connection(aioclient_mock) - - user_input = MOCK_USER_INPUT.copy() - with patch( - "homeassistant.components.directv.async_setup_entry", return_value=True - ), patch("homeassistant.components.directv.async_setup", return_value=True): - result = await hass.config_entries.flow.async_init( - DOMAIN, - context={CONF_SOURCE: SOURCE_IMPORT}, - data=user_input, - ) - - assert result["type"] == RESULT_TYPE_CREATE_ENTRY - assert result["title"] == HOST - - assert result["data"] - assert result["data"][CONF_HOST] == HOST - assert result["data"][CONF_RECEIVER_ID] == RECEIVER_ID - - async def test_full_user_flow_implementation( hass: HomeAssistantType, aioclient_mock: AiohttpClientMocker ) -> None: diff --git a/tests/components/directv/test_init.py b/tests/components/directv/test_init.py index 0d806d668a0..b56070f0e7e 100644 --- a/tests/components/directv/test_init.py +++ b/tests/components/directv/test_init.py @@ -6,22 +6,13 @@ from homeassistant.config_entries import ( ENTRY_STATE_SETUP_RETRY, ) from homeassistant.helpers.typing import HomeAssistantType -from homeassistant.setup import async_setup_component -from tests.components.directv import MOCK_CONFIG, mock_connection, setup_integration +from tests.components.directv import setup_integration from tests.test_util.aiohttp import AiohttpClientMocker # pylint: disable=redefined-outer-name -async def test_setup( - hass: HomeAssistantType, aioclient_mock: AiohttpClientMocker -) -> None: - """Test the DirecTV setup from configuration.""" - mock_connection(aioclient_mock) - assert await async_setup_component(hass, DOMAIN, MOCK_CONFIG) - - async def test_config_entry_not_ready( hass: HomeAssistantType, aioclient_mock: AiohttpClientMocker ) -> None: