saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Ensure Manjaro ARM reports the correct os_family of Arch.

Browse source
This commit is contained in:
Gareth J. Greenaway 2024-08-09 15:19:32 -07:00 • committed by Daniel Wozniak
parent 092a79ccb9
commit 852bf0004a
3 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/66796.fixed.md Normal file
View file

@ -0,0 +1 @@
Ensure Manjaro ARM reports the correct os_family of Arch.

1
salt/grains/core.py
View file

@ -1867,6 +1867,7 @@ _OS_FAMILY_MAP = {
"SLES_SAP": "Suse",
"Arch ARM": "Arch",
"Manjaro": "Arch",
"Manjaro ARM": "Arch",
"Antergos": "Arch",
"EndeavourOS": "Arch",
"ALT": "RedHat",

33
tests/pytests/unit/grains/test_core.py
View file

@ -1231,6 +1231,39 @@ def test_Parrot_OS_grains():
_run_os_grains_tests(_os_release_data, _os_release_map, expectation)
@pytest.mark.skip_unless_on_linux
def test_manjaro_arm_grains():
"""
Test if OS grains are parsed correctly in Manjaro ARM
"""
# /etc/os-release data taken from ParrotOS 5.1
_os_release_data = {
"NAME": "Manjaro ARM",
"ID": "manjaro-arm",
"ID_LIKE": "manjaro arch",
"PRETTY_NAME": "Manjaro ARM",
"ANSI_COLOR": "1;32",
"HOME_URL": "https://www.manjaro.org/",
"SUPPORT_URL": "https://forum.manjaro.org/c/arm/",
"LOGO": "manjarolinux",
}
_os_release_map = {
"_linux_distribution": ("Manjaro ARM", "24.03", "n/a"),
}
expectation = {
"os": "Manjaro ARM",
"os_family": "Arch",
"oscodename": "Manjaro ARM",
"osfullname": "Manjaro ARM",
"osrelease": "24.03",
"osrelease_info": (24, 3),
"osmajorrelease": 24,
"osfinger": "Manjaro ARM-24",
}
_run_os_grains_tests(_os_release_data, _os_release_map, expectation)
def test_unicode_error():
raise_unicode_mock = MagicMock(name="raise_unicode_error", side_effect=UnicodeError)
with patch("salt.grains.core.hostname"), patch(