Skip to content

Call out 3rd party containers more clearly #65684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 2 commits into from
Feb 4, 2022
Merged

Call out 3rd party containers more clearly #65684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04b5837
Call out 3rd party containers more clearly
balloob Feb 4, 2022
f67ba5a
Add root check back
balloob Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion homeassistant/helpers/system_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,11 @@ async def async_get_system_info(hass: HomeAssistant) -> dict[str, Any]:

# Determine installation type on current data
if info_object["docker"]:
if info_object["user"] == "root":
if info_object["user"] == "root" and os.path.isfile("/OFFICIAL_IMAGE"):
info_object["installation_type"] = "Home Assistant Container"
else:
info_object["installation_type"] = "Unsupported Third Party Container"

elif is_virtual_env():
info_object["installation_type"] = "Home Assistant Core"

Expand Down
6 changes: 3 additions & 3 deletions tests/helpers/test_system_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ async def test_container_installationtype(hass):
"""Test container installation type."""
with patch("platform.system", return_value="Linux"), patch(
"os.path.isfile", return_value=True
):
), patch("homeassistant.helpers.system_info.getuser", return_value="root"):
info = await hass.helpers.system_info.async_get_system_info()
assert info["installation_type"] == "Home Assistant Container"

with patch("platform.system", return_value="Linux"), patch(
"os.path.isfile", return_value=True
"os.path.isfile", side_effect=lambda file: file == "/.dockerenv"
), patch("homeassistant.helpers.system_info.getuser", return_value="user"):
info = await hass.helpers.system_info.async_get_system_info()
assert info["installation_type"] == "Unknown"
assert info["installation_type"] == "Unsupported Third Party Container"


async def test_getuser_keyerror(hass):
Expand Down