Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions tests/inventory/test_macos_build_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ def test_ok(self):
("24H23", ("macOS", 15, 8, 0, None), "macOS 15.8 (24H23)"),
("24H32", ("macOS", 15, 8, 1, None), "macOS 15.8.1 (24H32)"),
("24H232", ("macOS", 15, 8, 2, None), "macOS 15.8.2 (24H232)"),
("24H241", ("macOS", 15, 8, 3, None), "macOS 15.8.3 (24H241)"),
("25A5279m", ("macOS", 26, 0, 0, None), "macOS 26.0 (25A5279m)"),
("25A362", ("macOS", 26, 0, 1, None), "macOS 26.0.1 (25A362)"),
("25B78", ("macOS", 26, 1, 0, None), "macOS 26.1 (25B78)"),
Expand All @@ -173,8 +174,10 @@ def test_ok(self):
("25G229", ("macOS", 26, 7, 0, None), "macOS 26.7 (25G229)"),
("25G241", ("macOS", 26, 7, 1, None), "macOS 26.7.1 (25G241)"),
("25G332", ("macOS", 26, 7, 2, None), "macOS 26.7.2 (25G332)"),
("25G342", ("macOS", 26, 7, 3, None), "macOS 26.7.3 (25G342)"),
("26A434", ("macOS", 27, 0, 1, None), "macOS 27.0.1 (26A434)"),
("26B123", ("macOS", 27, 2, 0, None), "macOS 27.2 (26B123)"),
("26B8132", ("macOS", 27, 2, 1, None), "macOS 27.2.1 (26B8132)"),
):
expected_version_d = {
"name": name,
Expand Down
5 changes: 3 additions & 2 deletions zentral/contrib/inventory/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ def macos_version_from_build(build):
"23B81", "23B2082", "23C71", "23D60", "23G93", "23H222", "23J30",
"24A348", "24B91", "24D70", "24E263", "24G90", "24G231", "24H32",
"25A362", "25D2128", "25D771280a", "25E253", "25F80", "25G76", "25G241",
"26A434"):
"26A434", "26B8132"):
patch = 1
elif build in ("21G309", "21G320", "21G1974",
"22G91", "22G320", "22H313",
Expand All @@ -309,7 +309,8 @@ def macos_version_from_build(build):
elif build in ("21G417", "21G419", "21H1015",
"22G436", "22H417",
"23H417", "23J220",
"24G419"):
"24G419", "24H241",
"25G342"):
patch = 3
elif build in ("21G526", "21H1123",
"22G513", "22H420",
Expand Down
Loading