jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-24 21:57:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add internal/external url to safe mode (#36894)

Browse Source
This commit is contained in:
Paulus Schoutsen 2020-06-17 17:14:48 -07:00 committed by GitHub
parent 7920c5e5e8
commit 94132e5572
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
homeassistant/bootstrap.py
View File

@ -124,8 +124,12 @@ async def async_setup_hass(
await hass.async_block_till_done() await hass.async_block_till_done()
safe_mode = True safe_mode = True
old_config = hass.config
hass = core.HomeAssistant() hass = core.HomeAssistant()
hass.config.config_dir = config_dir hass.config.skip_pip = old_config.skip_pip
hass.config.internal_url = old_config.internal_url
hass.config.external_url = old_config.external_url
hass.config.config_dir = old_config.config_dir
if safe_mode: if safe_mode:
_LOGGER.info("Starting in safe mode") _LOGGER.info("Starting in safe mode")

18
tests/test_bootstrap.py
View File

@ -28,6 +28,11 @@ VERSION_PATH = os.path.join(get_test_config_dir(), config_util.VERSION_FILE)
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@pytest.fixture(autouse=True)
def apply_mock_storage(hass_storage):
"""Apply the storage mock."""
@patch("homeassistant.bootstrap.async_enable_logging", Mock()) @patch("homeassistant.bootstrap.async_enable_logging", Mock())
async def test_home_assistant_core_config_validation(hass): async def test_home_assistant_core_config_validation(hass):
"""Test if we pass in wrong information for HA conf.""" """Test if we pass in wrong information for HA conf."""
@ -456,7 +461,14 @@ async def test_setup_safe_mode_if_no_frontend(
with patch( with patch(
"homeassistant.config.async_hass_config_yaml", "homeassistant.config.async_hass_config_yaml",
return_value={"map": {}, "person": {"invalid": True}}, return_value={
"homeassistant": {
"internal_url": "http://192.168.1.100:8123",
"external_url": "https://abcdef.ui.nabu.casa",
},
"map": {},
"person": {"invalid": True},
},
), patch("homeassistant.components.http.start_http_server_and_save_config"): ), patch("homeassistant.components.http.start_http_server_and_save_config"):
hass = await bootstrap.async_setup_hass( hass = await bootstrap.async_setup_hass(
config_dir=get_test_config_dir(), config_dir=get_test_config_dir(),
@ -469,3 +481,7 @@ async def test_setup_safe_mode_if_no_frontend(
) )
assert "safe_mode" in hass.config.components assert "safe_mode" in hass.config.components
assert hass.config.config_dir == get_test_config_dir()
assert hass.config.skip_pip
assert hass.config.internal_url == "http://192.168.1.100:8123"
assert hass.config.external_url == "https://abcdef.ui.nabu.casa"