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

Updated pkg upgrade and downgrade tests

Browse source
This commit is contained in:
David Murphy 2024-05-02 16:57:35 -06:00 • committed by Daniel Wozniak
parent f9bd4ad1b6
commit 72e414becc
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/pytests/pkg/downgrade/test_salt_downgrade.py
View file

@ -90,7 +90,7 @@ def test_salt_downgrade_minion(salt_call_cli, install_salt):
@pytest.mark.skip_unless_on_linux(reason="Only supported on Linux family")
def test_salt_downgrade_master(salt_cli, install_salt):
def test_salt_downgrade_master(install_salt):
"""
Test an downgrade of Salt Master.
"""
@ -105,11 +105,12 @@ def test_salt_downgrade_master(salt_cli, install_salt):
original_py_version = install_salt.package_python_version()
# Verify current install version is setup correctly and works
ret = salt_cli.run("--version")
bin_file = "salt"
ret = install_salt.proc.run(bin_file, "--version")
assert ret.returncode == 0
assert packaging.version.parse(ret.data) == packaging.version.parse(
install_salt.artifact_version
)
assert packaging.version.parse(
ret.stdout.strip().split()[1]
) == packaging.version.parse(install_salt.artifact_version)
# Verify there is a running master by getting its PID
salt_name = "salt"
@ -131,7 +132,6 @@ def test_salt_downgrade_master(salt_cli, install_salt):
# Downgrade Salt to the previous version and test
install_salt.install(downgrade=True)
bin_file = "salt"
# Verify there is a new running master by getting its PID and comparing it
# with the PID from before the upgrade

19
tests/pytests/pkg/upgrade/test_salt_upgrade.py
View file

@ -87,7 +87,7 @@ def test_salt_upgrade_minion(salt_call_cli, install_salt):
@pytest.mark.skip_unless_on_linux(reason="Only supported on Linux family")
def test_salt_upgrade_master(salt_cli, install_salt):
def test_salt_upgrade_master(install_salt):
"""
Test an upgrade of Salt Master.
"""
@ -98,11 +98,12 @@ def test_salt_upgrade_master(salt_cli, install_salt):
original_py_version = install_salt.package_python_version()
# Verify previous install version is setup correctly and works
ret = salt_cli.run("--version")
bin_file = "salt"
ret = install_salt.proc.run(bin_file, "--version")
assert ret.returncode == 0
assert packaging.version.parse(ret.data) < packaging.version.parse(
install_salt.artifact_version
)
assert packaging.version.parse(
ret.stdout.strip().split()[1]
) == packaging.version.parse(install_salt.artifact_version)
# Verify there is a running minion by getting its PID
salt_name = "salt"
@ -124,11 +125,11 @@ def test_salt_upgrade_master(salt_cli, install_salt):
# Upgrade Salt from previous version and test
install_salt.install(upgrade=True)
ret = salt_cli.run("--version")
ret = install_salt.proc.run(bin_file, "--version")
assert ret.returncode == 0
assert packaging.version.parse(ret.data) == packaging.version.parse(
install_salt.artifact_version
)
assert packaging.version.parse(
ret.stdout.strip().split()[1]
) == packaging.version.parse(install_salt.artifact_version)
# Verify there is a new running master by getting its PID and comparing it
# with the PID from before the upgrade