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

Add some tests

Browse source
This commit is contained in:
Shane Lee 2024-01-30 14:22:29 -07:00 • committed by Pedro Algarvio
parent e4a62fe2d5
commit 6645801eee
2 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/utils/rsax931.py
View file

@ -44,8 +44,7 @@ def _find_libcrypto():
lib = glob.glob("/opt/salt/lib/libcrypto.dylib")
# look in location salt is running from
# this accounts for running from an unpacked
# onedir file
# this accounts for running from an unpacked onedir file
lib = lib or glob.glob("lib/libcrypto.dylib")
# Look in the location relative to the python binary

38
tests/pytests/unit/utils/test_rsax931.py
View file

@ -19,7 +19,7 @@ from salt.utils.rsax931 import (
_find_libcrypto,
_load_libcrypto,
)
from tests.support.mock import patch
from tests.support.mock import patch, MagicMock
@pytest.fixture
@ -215,6 +215,42 @@ def test_find_libcrypto_darwin_catalina():
assert "/usr/lib/libcrypto.44.dylib" == lib_path
def test_find_libcrypto_darwin_pip_install():
"""
Test _find_libcrypto on a macOS host where there salt has been installed
into an existing python or virtual environment.
"""
bin_path = "/Library/Frameworks/Python.framework/Versions/3.10/bin/python3.10"
expected = "/Library/Frameworks/Python.framework/Versions/3.10/lib/libcrypto.dylib"
glob_effect = ([], [], ["yay"], [], [], [], [])
with patch("salt.utils.platform.is_darwin", lambda: True),\
patch("sys.executable", bin_path),\
patch("os.path.islink", return_value=False),\
patch.object(glob, "glob", side_effect=glob_effect) as mock_glob:
lib_path = _find_libcrypto()
assert lib_path == "yay"
mock_glob.assert_any_call(expected)
def test_find_libcrypto_darwin_pip_install_venv():
"""
Test _find_libcrypto on a macOS host where there salt has been installed
into an existing python or virtual environment.
"""
src_path = "/Library/Frameworks/Python.framework/Versions/3.10/bin/python3.10"
lnk_path = "/Users/bill/src/salt/venv/bin/python"
expected = "/Library/Frameworks/Python.framework/Versions/3.10/lib/libcrypto.dylib"
glob_effect = ([], [], ["yay"], [], [], [], [])
with patch("salt.utils.platform.is_darwin", lambda: True), \
patch("sys.executable", lnk_path), \
patch("os.path.islink", return_value=True), \
patch("os.path.realpath", return_value=src_path), \
patch.object(glob, "glob", side_effect=glob_effect) as mock_glob:
lib_path = _find_libcrypto()
assert lib_path == "yay"
mock_glob.assert_any_call(expected)
def test_find_libcrypto_darwin_bigsur_packaged():
"""
Test _find_libcrypto on a Darwin-like macOS host where there isn't a