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

Remove decorator for yumpkg.download

Browse source
This commit is contained in:
twangboy 2023-10-24 09:16:36 -06:00 • committed by Pedro Algarvio
parent b2525aa042
commit bd469106f7
2 changed files with 20 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/yumpkg.py
View file

@ -30,7 +30,6 @@ import string
import salt.utils.args
import salt.utils.data
import salt.utils.decorators.path
import salt.utils.environment
import salt.utils.files
import salt.utils.functools
@ -3333,7 +3332,6 @@ def modified(*packages, **flags):
return __salt__["lowpkg.modified"](*packages, **flags)
@salt.utils.decorators.path.which("yumdownloader")
def download(*packages, **kwargs):
"""
.. versionadded:: 2015.5.0
@ -3353,6 +3351,9 @@ def download(*packages, **kwargs):
salt '*' pkg.download httpd
salt '*' pkg.download httpd postfix
"""
if not salt.utils.path.which("yumdownloader"):
raise CommandExecutionError("'yumdownloader' command not available")
if not packages:
raise SaltInvocationError("No packages were specified")

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

@ -8,6 +8,7 @@ import pytest
import salt.modules.cmdmod as cmdmod
import salt.modules.pkg_resource as pkg_resource
import salt.modules.rpm_lowpkg as rpm
import salt.modules.yumpkg as yumpkg
import salt.utils.platform
from salt.exceptions import CommandExecutionError, MinionError, SaltInvocationError
from tests.support.mock import MagicMock, Mock, call, patch
@ -19,25 +20,6 @@ pytestmark = [
]
# https://dev.to/stack-labs/how-to-mock-a-decorator-in-python-55jc
def mock_decorator(*args, **kwargs):
"""Decorate by doing nothing."""
def decorator(f):
@wraps(f)
def decorated_function(*args, **kwargs):
return f(*args, **kwargs)
return decorated_function
return decorator
patch("salt.utils.decorators.path.which", mock_decorator).start()
import salt.modules.yumpkg as yumpkg
@pytest.fixture
def configure_loader_modules():
def _add_data(data, key, value):
@ -1146,11 +1128,13 @@ def test_del_repo_single_file():
def test_download_error_no_packages():
with pytest.raises(SaltInvocationError):
patch_which = patch("salt.utils.path.which", MagicMock(return_value="path.exe"))
with patch_which, pytest.raises(SaltInvocationError):
yumpkg.download()
def test_download():
patch_which = patch("salt.utils.path.which", MagicMock(return_value="path.exe"))
patch_exists = patch("os.path.exists", MagicMock(return_value=False))
patch_makedirs = patch("os.makedirs")
mock_listdir = MagicMock(side_effect=([], ["spongebob-1.2.rpm"]))
@ -1160,7 +1144,7 @@ def test_download():
"cmd.run": mock_run,
}
patch_salt = patch.dict(yumpkg.__salt__, dict_salt)
with patch_exists, patch_makedirs, patch_listdir, patch_salt:
with patch_which, patch_exists, patch_makedirs, patch_listdir, patch_salt:
result = yumpkg.download("spongebob")
cmd = ["yumdownloader", "-q", "--destdir=/var/cache/yum/packages", "spongebob"]
mock_run.assert_called_once_with(
@ -1171,6 +1155,7 @@ def test_download():
def test_download_failed():
patch_which = patch("salt.utils.path.which", MagicMock(return_value="path.exe"))
patch_exists = patch("os.path.exists", MagicMock(return_value=True))
mock_listdir = MagicMock(return_value=["spongebob-1.2.rpm", "junk.txt"])
patch_listdir = patch("os.listdir", mock_listdir)
@ -1180,7 +1165,7 @@ def test_download_failed():
"cmd.run": mock_run,
}
patch_salt = patch.dict(yumpkg.__salt__, dict_salt)
with patch_exists, patch_listdir, patch_unlink, patch_salt:
with patch_which, patch_exists, patch_listdir, patch_unlink, patch_salt:
result = yumpkg.download("spongebob", "patrick")
cmd = [
"yumdownloader",
@ -1199,7 +1184,14 @@ def test_download_failed():
assert result == expected
def test_download_missing_yumdownloader():
patch_which = patch("salt.utils.path.which", MagicMock(return_value=None))
with patch_which, pytest.raises(CommandExecutionError):
yumpkg.download("spongebob")
def test_download_to_purge():
patch_which = patch("salt.utils.path.which", MagicMock(return_value="path.exe"))
patch_exists = patch("os.path.exists", MagicMock(return_value=True))
mock_listdir = MagicMock(return_value=["spongebob-1.2.rpm", "junk.txt"])
patch_listdir = patch("os.listdir", mock_listdir)
@ -1209,7 +1201,7 @@ def test_download_to_purge():
"cmd.run": mock_run,
}
patch_salt = patch.dict(yumpkg.__salt__, dict_salt)
with patch_exists, patch_listdir, patch_unlink, patch_salt:
with patch_which, patch_exists, patch_listdir, patch_unlink, patch_salt:
result = yumpkg.download("spongebob")
cmd = ["yumdownloader", "-q", "--destdir=/var/cache/yum/packages", "spongebob"]
mock_run.assert_called_once_with(
@ -1220,6 +1212,7 @@ def test_download_to_purge():
def test_download_unlink_error():
patch_which = patch("salt.utils.path.which", MagicMock(return_value="path.exe"))
patch_exists = patch("os.path.exists", MagicMock(return_value=True))
se_listdir = (
["spongebob-1.2.rpm", "junk.txt"],
@ -1233,7 +1226,7 @@ def test_download_unlink_error():
"cmd.run": mock_run,
}
patch_salt = patch.dict(yumpkg.__salt__, dict_salt)
with patch_exists, patch_listdir, patch_unlink, patch_salt:
with patch_which, patch_exists, patch_listdir, patch_unlink, patch_salt:
with pytest.raises(CommandExecutionError):
yumpkg.download("spongebob")