evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Downloader test cases and error title (#114847)

Browse source 
* Fix test cases

* Return value

* isdir change

* FIx test cases and error title

* Removing patch

* Tiny needless fine-tuning
This commit is contained in:
Erwin Douna 2024-04-08 15:28:07 +02:00 • committed by GitHub
parent d9dada4fb3
commit 85b453b86c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
homeassistant/components/downloader/config_flow.py
View file

@ -29,7 +29,7 @@ class DownloaderConfigFlow(ConfigFlow, domain=DOMAIN):
try:
await self._validate_input(user_input)
except DirectoryDoesNotExist:
errors["base"] = "cannot_connect"
errors["base"] = "directory_does_not_exist"
else:
return self.async_create_entry(title=DEFAULT_NAME, data=user_input)

2
homeassistant/components/downloader/strings.json
View file

@ -6,7 +6,7 @@
}
},
"error": {
"cannot_connect": "The directory could not be reached. Please check your settings."
"directory_does_not_exist": "The directory could not be reached. Please check your settings."
},
"abort": {
"single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"

39
tests/components/downloader/test_config_flow.py
View file

@ -5,7 +5,6 @@ from unittest.mock import patch
import pytest
from homeassistant import config_entries
from homeassistant.components.downloader.config_flow import DirectoryDoesNotExist
from homeassistant.components.downloader.const import CONF_DOWNLOAD_DIR, DOMAIN
from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
from homeassistant.core import HomeAssistant
@ -21,39 +20,35 @@ async def test_user_form(hass: HomeAssistant) -> None:
result = await hass.config_entries.flow.async_init(
DOMAIN, context={"source": SOURCE_USER}
)
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
user_input=CONFIG,
)
assert result["type"] is FlowResultType.FORM
with patch(
"homeassistant.components.downloader.async_setup_entry",
return_value=True,
):
with patch("os.path.isdir", return_value=False):
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
user_input=CONFIG,
)
assert result["type"] is FlowResultType.FORM
with patch(
"homeassistant.components.downloader.config_flow.DownloaderConfigFlow._validate_input",
side_effect=DirectoryDoesNotExist,
):
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "user"
assert result["errors"] == {"base": "cannot_connect"}
assert result["step_id"] == "user"
assert result["errors"] == {"base": "directory_does_not_exist"}
with (
patch(
"homeassistant.components.downloader.async_setup_entry", return_value=True
),
patch(
"homeassistant.components.downloader.config_flow.DownloaderConfigFlow._validate_input",
return_value=None,
"os.path.isdir",
return_value=True,
),
):
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
user_input=CONFIG,
)
await hass.async_block_till_done()
assert result["type"] is FlowResultType.CREATE_ENTRY
assert result["title"] == "Downloader"
assert result["data"] == {"download_dir": "download_dir"}
@ -66,7 +61,6 @@ async def test_single_instance_allowed(
) -> None:
"""Test we abort if already setup."""
mock_config_entry = MockConfigEntry(domain=DOMAIN)
mock_config_entry.add_to_hass(hass)
result = await hass.config_entries.flow.async_init(
@ -84,21 +78,19 @@ async def test_import_flow_success(hass: HomeAssistant) -> None:
"homeassistant.components.downloader.async_setup_entry", return_value=True
),
patch(
"homeassistant.components.downloader.config_flow.DownloaderConfigFlow._validate_input",
return_value=None,
"os.path.isdir",
return_value=True,
),
):
result = await hass.config_entries.flow.async_init(
DOMAIN,
context={"source": config_entries.SOURCE_IMPORT},
data={},
data=CONFIG,
)
await hass.async_block_till_done()
assert result["type"] is FlowResultType.CREATE_ENTRY
assert result["title"] == "Downloader"
assert result["data"] == {}
assert result["options"] == {}
assert result["data"] == CONFIG
async def test_import_flow_directory_not_found(hass: HomeAssistant) -> None:
@ -112,6 +104,5 @@ async def test_import_flow_directory_not_found(hass: HomeAssistant) -> None:
},
)
await hass.async_block_till_done()
assert result["type"] is FlowResultType.ABORT
assert result["reason"] == "directory_does_not_exist"