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

Added support and tests for dnf5 to services_need_restart for yum packages

Browse source
This commit is contained in:
David Murphy 2025-03-03 13:21:10 -07:00 • committed by Daniel Wozniak
parent 59ddf3cf88
commit 002d02a5e7
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1 @@
Added support and tests for dnf5 to services_need_restart for yum packages

11
salt/modules/yumpkg.py
View file

@ -3541,12 +3541,17 @@ def services_need_restart(**kwargs):
salt '*' pkg.services_need_restart salt '*' pkg.services_need_restart
""" """
if _yum() != "dnf": if _yum() in ("dnf", "dnf5"):
raise CommandExecutionError("dnf is required to list outdated services.") raise CommandExecutionError(
"dnf or dnf5 is required to list outdated services."
)
if not salt.utils.systemd.booted(__context__): if not salt.utils.systemd.booted(__context__):
raise CommandExecutionError("systemd is required to list outdated services.") raise CommandExecutionError("systemd is required to list outdated services.")
cmd = ["dnf", "--quiet", "needs-restarting"] if _yum() == "dnf5":
cmd = ["dnf5", "--quiet", "needs-restarting"]
else:
cmd = ["dnf", "--quiet", "needs-restarting"]
dnf_output = __salt__["cmd.run_stdout"](cmd, python_shell=False) dnf_output = __salt__["cmd.run_stdout"](cmd, python_shell=False)
if not dnf_output: if not dnf_output:
return [] return []

9
tests/pytests/unit/modules/test_yumpkg.py
View file

@ -3163,6 +3163,15 @@ def test_services_need_restart_no_dnf_output():
assert yumpkg.services_need_restart() == [] assert yumpkg.services_need_restart() == []
def test_services_need_restart_no_dnf5_output():
patch_yum = patch("salt.modules.yumpkg._yum", Mock(return_value="dnf5"))
patch_booted = patch("salt.utils.systemd.booted", Mock(return_value=True))
mock_run_stdout = MagicMock(return_value="")
patch_run_stdout = patch.dict(yumpkg.__salt__, {"cmd.run_stdout": mock_run_stdout})
with patch_yum, patch_booted, patch_run_stdout:
assert yumpkg.services_need_restart() == []
def test_61003_pkg_should_not_fail_when_target_not_in_old_pkgs(): def test_61003_pkg_should_not_fail_when_target_not_in_old_pkgs():
patch_list_pkgs = patch( patch_list_pkgs = patch(
"salt.modules.yumpkg.list_pkgs", return_value={}, autospec=True "salt.modules.yumpkg.list_pkgs", return_value={}, autospec=True