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 4

Strip github version additions, so checking major.minor version of Salt

Browse source
This commit is contained in:
David Murphy 2024-06-11 14:13:06 -06:00 • committed by Daniel Wozniak
parent 12332188af
commit 70a69e9e2c
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/pytests/pkg/integration/test_version.py
View file

@ -13,8 +13,9 @@ def test_salt_version(version, install_salt):
"""
test_bin = os.path.join(*install_salt.binary_paths["salt"])
ret = install_salt.proc.run(test_bin, "--version")
stripped_version = version.split("+")[0] # strip off any git version additions
actual = ret.stdout.strip().split(" ")[:2]
expected = ["salt", version]
expected = ["salt", stripped_version]
assert actual == expected
@ -70,13 +71,14 @@ def test_compare_versions(version, binary, install_salt):
Test compare versions
"""
if binary in install_salt.binary_paths:
stripped_version = version.split("+")[0] # strip off any git version additions
ret = install_salt.proc.run(
*install_salt.binary_paths[binary],
"--version",
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
)
ret.stdout.matcher.fnmatch_lines([f"*{version}*"])
ret.stdout.matcher.fnmatch_lines([f"*{stripped_version}*"])
else:
if platform.is_windows():
pytest.skip(f"Binary not available on windows: {binary}")