Skip to content

Commit b079f7b

Browse files
twangboydwoz
authored andcommitted
Add changelog
1 parent fa61d56 commit b079f7b

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

changelog/66936.fixed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix an issue with the osrelease_info grain that was displaying empty strings

tests/pytests/unit/grains/test_core.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,7 +1552,7 @@ def test_windows_platform_data():
15521552
"2016Server",
15531553
"2019Server",
15541554
"2022Server",
1555-
"2025Server"
1555+
"2025Server",
15561556
]
15571557
assert returned_grains["osrelease"] in valid_releases
15581558

@@ -3058,19 +3058,17 @@ def test_osdata_virtual_key_win():
30583058
@pytest.mark.parametrize(
30593059
"osrelease, expected",
30603060
[
3061-
("2025Server", (2025, )),
3061+
("2025Server", (2025,)),
30623062
("2012ServerR2", (2012, 2)),
3063-
("11", (11, )),
3064-
("8.1", (8, 1))
3065-
]
3063+
("11", (11,)),
3064+
("8.1", (8, 1)),
3065+
],
30663066
)
30673067
def test_windows_osdata_osrelease_info(osrelease, expected):
30683068
platform_data = core._windows_platform_data()
30693069
platform_data["osrelease"] = osrelease
30703070
mock_platform_data = MagicMock(return_value=platform_data)
3071-
with patch.object(
3072-
core, "_windows_platform_data", mock_platform_data
3073-
):
3071+
with patch.object(core, "_windows_platform_data", mock_platform_data):
30743072
os_data = core.os_data()
30753073
assert os_data["osrelease_info"] == expected
30763074

0 commit comments

Comments
 (0)