mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Commented out new tests for salt-master, to check build
This commit is contained in:
David Murphy
Daniel Wozniak
parent
18a4dd8282
commit
7f8dbe2ed2
2 changed files with 138 additions and 136 deletions
|
|
@ -1,6 +1,7 @@
|
|||
import packaging.version
|
||||
import psutil
|
||||
import pytest
|
||||
|
||||
## DGM import pytest
|
||||
from pytestskipmarkers.utils import platform
|
||||
|
||||
|
||||
|
|
@ -90,64 +91,64 @@ def test_salt_downgrade_minion(salt_call_cli, install_salt):
|
|||
assert "Authentication information could" in use_lib.stderr
|
||||
|
||||
|
||||
@pytest.mark.skip_unless_on_linux(reason="Only supported on Linux family")
|
||||
def test_salt_downgrade_master(install_salt):
|
||||
"""
|
||||
Test an downgrade of Salt Master.
|
||||
"""
|
||||
if not install_salt.downgrade:
|
||||
pytest.skip("Not testing a downgrade, do not run")
|
||||
|
||||
is_downgrade_to_relenv = packaging.version.parse(
|
||||
install_salt.prev_version
|
||||
) >= packaging.version.parse("3006.0")
|
||||
|
||||
if is_downgrade_to_relenv:
|
||||
original_py_version = install_salt.package_python_version()
|
||||
|
||||
# Verify current install version is setup correctly and works
|
||||
bin_file = "salt"
|
||||
ret = install_salt.proc.run(bin_file, "--version")
|
||||
assert ret.returncode == 0
|
||||
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"
|
||||
process_name = "salt-master"
|
||||
|
||||
old_pid = []
|
||||
|
||||
# psutil process name only returning first part of the command '/opt/saltstack/'
|
||||
# need to check all of command line for salt-minion
|
||||
# ['/opt/saltstack/salt/bin/python3.10 /usr/bin/salt-master EventPublisher']
|
||||
# and psutil is only returning the salt-minion once
|
||||
for proc in psutil.process_iter():
|
||||
if salt_name in proc.name():
|
||||
cmdl_strg = " ".join(str(element) for element in proc.cmdline())
|
||||
if process_name in cmdl_strg:
|
||||
old_pid.append(proc.pid)
|
||||
|
||||
assert old_pid
|
||||
|
||||
# Downgrade Salt to the previous version and test
|
||||
install_salt.install(downgrade=True)
|
||||
|
||||
# Verify there is a new running master by getting its PID and comparing it
|
||||
# with the PID from before the upgrade
|
||||
new_pid = []
|
||||
for proc in psutil.process_iter():
|
||||
if salt_name in proc.name():
|
||||
cmdl_strg = " ".join(str(element) for element in proc.cmdline())
|
||||
if process_name in cmdl_strg:
|
||||
new_pid.append(proc.pid)
|
||||
|
||||
assert new_pid
|
||||
assert new_pid != old_pid
|
||||
|
||||
ret = install_salt.proc.run(bin_file, "--version")
|
||||
assert ret.returncode == 0
|
||||
assert packaging.version.parse(
|
||||
ret.stdout.strip().split()[1]
|
||||
) < packaging.version.parse(install_salt.artifact_version)
|
||||
## DGM @pytest.mark.skip_unless_on_linux(reason="Only supported on Linux family")
|
||||
## DGM def test_salt_downgrade_master(install_salt):
|
||||
## DGM """
|
||||
## DGM Test an downgrade of Salt Master.
|
||||
## DGM """
|
||||
## DGM if not install_salt.downgrade:
|
||||
## DGM pytest.skip("Not testing a downgrade, do not run")
|
||||
## DGM
|
||||
## DGM is_downgrade_to_relenv = packaging.version.parse(
|
||||
## DGM install_salt.prev_version
|
||||
## DGM ) >= packaging.version.parse("3006.0")
|
||||
## DGM
|
||||
## DGM if is_downgrade_to_relenv:
|
||||
## DGM original_py_version = install_salt.package_python_version()
|
||||
## DGM
|
||||
## DGM # Verify current install version is setup correctly and works
|
||||
## DGM bin_file = "salt"
|
||||
## DGM ret = install_salt.proc.run(bin_file, "--version")
|
||||
## DGM assert ret.returncode == 0
|
||||
## DGM assert packaging.version.parse(
|
||||
## DGM ret.stdout.strip().split()[1]
|
||||
## DGM ) == packaging.version.parse(install_salt.artifact_version)
|
||||
## DGM
|
||||
## DGM # Verify there is a running master by getting its PID
|
||||
## DGM salt_name = "salt"
|
||||
## DGM process_name = "salt-master"
|
||||
## DGM
|
||||
## DGM old_pid = []
|
||||
## DGM
|
||||
## DGM # psutil process name only returning first part of the command '/opt/saltstack/'
|
||||
## DGM # need to check all of command line for salt-minion
|
||||
## DGM # ['/opt/saltstack/salt/bin/python3.10 /usr/bin/salt-master EventPublisher']
|
||||
## DGM # and psutil is only returning the salt-minion once
|
||||
## DGM for proc in psutil.process_iter():
|
||||
## DGM if salt_name in proc.name():
|
||||
## DGM cmdl_strg = " ".join(str(element) for element in proc.cmdline())
|
||||
## DGM if process_name in cmdl_strg:
|
||||
## DGM old_pid.append(proc.pid)
|
||||
## DGM
|
||||
## DGM assert old_pid
|
||||
## DGM
|
||||
## DGM # Downgrade Salt to the previous version and test
|
||||
## DGM install_salt.install(downgrade=True)
|
||||
## DGM
|
||||
## DGM # Verify there is a new running master by getting its PID and comparing it
|
||||
## DGM # with the PID from before the upgrade
|
||||
## DGM new_pid = []
|
||||
## DGM for proc in psutil.process_iter():
|
||||
## DGM if salt_name in proc.name():
|
||||
## DGM cmdl_strg = " ".join(str(element) for element in proc.cmdline())
|
||||
## DGM if process_name in cmdl_strg:
|
||||
## DGM new_pid.append(proc.pid)
|
||||
## DGM
|
||||
## DGM assert new_pid
|
||||
## DGM assert new_pid != old_pid
|
||||
## DGM
|
||||
## DGM ret = install_salt.proc.run(bin_file, "--version")
|
||||
## DGM assert ret.returncode == 0
|
||||
## DGM assert packaging.version.parse(
|
||||
## DGM ret.stdout.strip().split()[1]
|
||||
## DGM ) < packaging.version.parse(install_salt.artifact_version)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@ import logging
|
|||
|
||||
import packaging.version
|
||||
import psutil
|
||||
import pytest
|
||||
|
||||
## DGM import pytest
|
||||
from pytestskipmarkers.utils import platform
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
|
@ -110,76 +111,76 @@ def test_salt_upgrade_minion(
|
|||
assert "Authentication information could" in use_lib.stderr
|
||||
|
||||
|
||||
@pytest.mark.skip_unless_on_linux(reason="Only supported on Linux family")
|
||||
def test_salt_upgrade_master(
|
||||
install_salt,
|
||||
): # pylint: disable=logging-fstring-interpolation
|
||||
"""
|
||||
Test an upgrade of Salt Master.
|
||||
"""
|
||||
log.warning("DGM test_salt_upgrade_master entry")
|
||||
if not install_salt.upgrade:
|
||||
pytest.skip("Not testing an upgrade, do not run")
|
||||
|
||||
if install_salt.relenv:
|
||||
original_py_version = install_salt.package_python_version()
|
||||
|
||||
# Verify previous install version is setup correctly and works
|
||||
bin_file = "salt"
|
||||
ret = install_salt.proc.run(bin_file, "--version")
|
||||
log.warning(f"DGM test_salt_upgrade_master , installed_version ret '{ret}'")
|
||||
dgm_ret_version = packaging.version.parse(ret.stdout.strip().split()[1])
|
||||
dgm_pkg_version_parsed = packaging.version.parse(install_salt.artifact_version)
|
||||
log.warning(
|
||||
f"DGM test_salt_upgrade_master , installed_version ret parsed '{dgm_ret_version}', artifact_version '{install_salt.artifact_version}', pkg_version_parsed '{dgm_pkg_version_parsed}'"
|
||||
)
|
||||
|
||||
assert ret.returncode == 0
|
||||
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"
|
||||
process_name = "salt-master"
|
||||
|
||||
old_pid = []
|
||||
|
||||
# psutil process name only returning first part of the command '/opt/saltstack/'
|
||||
# need to check all of command line for salt-master
|
||||
# ['/opt/saltstack/salt/bin/python3.10 /usr/bin/salt-master EventPublisher']
|
||||
# and psutil is only returning the salt-minion once
|
||||
for proc in psutil.process_iter():
|
||||
if salt_name in proc.name():
|
||||
cmdl_strg = " ".join(str(element) for element in proc.cmdline())
|
||||
if process_name in cmdl_strg:
|
||||
old_pid.append(proc.pid)
|
||||
|
||||
assert old_pid
|
||||
|
||||
# Upgrade Salt from previous version and test
|
||||
install_salt.install(upgrade=True)
|
||||
ret = install_salt.proc.run(bin_file, "--version")
|
||||
log.warning(f"DGM test_salt_upgrade_master , upgrade_version ret '{ret}'")
|
||||
dgm_ret_version = packaging.version.parse(ret.stdout.strip().split()[1])
|
||||
dgm_pkg_version_parsed = packaging.version.parse(install_salt.artifact_version)
|
||||
log.warning(
|
||||
f"DGM test_salt_upgrade_master , upgrade_version ret parsed '{dgm_ret_version}', artifact_version '{install_salt.artifact_version}', pkg_version_parsed '{dgm_pkg_version_parsed}'"
|
||||
)
|
||||
|
||||
assert ret.returncode == 0
|
||||
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
|
||||
new_pid = []
|
||||
for proc in psutil.process_iter():
|
||||
if salt_name in proc.name():
|
||||
cmdl_strg = " ".join(str(element) for element in proc.cmdline())
|
||||
if process_name in cmdl_strg:
|
||||
new_pid.append(proc.pid)
|
||||
|
||||
assert new_pid
|
||||
assert new_pid != old_pid
|
||||
## DGM @pytest.mark.skip_unless_on_linux(reason="Only supported on Linux family")
|
||||
## DGM def test_salt_upgrade_master(
|
||||
## DGM install_salt,
|
||||
## DGM ): # pylint: disable=logging-fstring-interpolation
|
||||
## DGM """
|
||||
## DGM Test an upgrade of Salt Master.
|
||||
## DGM """
|
||||
## DGM log.warning("DGM test_salt_upgrade_master entry")
|
||||
## DGM if not install_salt.upgrade:
|
||||
## DGM pytest.skip("Not testing an upgrade, do not run")
|
||||
## DGM
|
||||
## DGM if install_salt.relenv:
|
||||
## DGM original_py_version = install_salt.package_python_version()
|
||||
## DGM
|
||||
## DGM # Verify previous install version is setup correctly and works
|
||||
## DGM bin_file = "salt"
|
||||
## DGM ret = install_salt.proc.run(bin_file, "--version")
|
||||
## DGM log.warning(f"DGM test_salt_upgrade_master , installed_version ret '{ret}'")
|
||||
## DGM dgm_ret_version = packaging.version.parse(ret.stdout.strip().split()[1])
|
||||
## DGM dgm_pkg_version_parsed = packaging.version.parse(install_salt.artifact_version)
|
||||
## DGM log.warning(
|
||||
## DGM f"DGM test_salt_upgrade_master , installed_version ret parsed '{dgm_ret_version}', artifact_version '{install_salt.artifact_version}', pkg_version_parsed '{dgm_pkg_version_parsed}'"
|
||||
## DGM )
|
||||
## DGM
|
||||
## DGM assert ret.returncode == 0
|
||||
## DGM assert packaging.version.parse(
|
||||
## DGM ret.stdout.strip().split()[1]
|
||||
## DGM ) == packaging.version.parse(install_salt.artifact_version)
|
||||
## DGM
|
||||
## DGM # Verify there is a running minion by getting its PID
|
||||
## DGM salt_name = "salt"
|
||||
## DGM process_name = "salt-master"
|
||||
## DGM
|
||||
## DGM old_pid = []
|
||||
## DGM
|
||||
## DGM # psutil process name only returning first part of the command '/opt/saltstack/'
|
||||
## DGM # need to check all of command line for salt-master
|
||||
## DGM # ['/opt/saltstack/salt/bin/python3.10 /usr/bin/salt-master EventPublisher']
|
||||
## DGM # and psutil is only returning the salt-minion once
|
||||
## DGM for proc in psutil.process_iter():
|
||||
## DGM if salt_name in proc.name():
|
||||
## DGM cmdl_strg = " ".join(str(element) for element in proc.cmdline())
|
||||
## DGM if process_name in cmdl_strg:
|
||||
## DGM old_pid.append(proc.pid)
|
||||
## DGM
|
||||
## DGM assert old_pid
|
||||
## DGM
|
||||
## DGM # Upgrade Salt from previous version and test
|
||||
## DGM install_salt.install(upgrade=True)
|
||||
## DGM ret = install_salt.proc.run(bin_file, "--version")
|
||||
## DGM log.warning(f"DGM test_salt_upgrade_master , upgrade_version ret '{ret}'")
|
||||
## DGM dgm_ret_version = packaging.version.parse(ret.stdout.strip().split()[1])
|
||||
## DGM dgm_pkg_version_parsed = packaging.version.parse(install_salt.artifact_version)
|
||||
## DGM log.warning(
|
||||
## DGM f"DGM test_salt_upgrade_master , upgrade_version ret parsed '{dgm_ret_version}', artifact_version '{install_salt.artifact_version}', pkg_version_parsed '{dgm_pkg_version_parsed}'"
|
||||
## DGM )
|
||||
## DGM
|
||||
## DGM assert ret.returncode == 0
|
||||
## DGM assert packaging.version.parse(
|
||||
## DGM ret.stdout.strip().split()[1]
|
||||
## DGM ) == packaging.version.parse(install_salt.artifact_version)
|
||||
## DGM
|
||||
## DGM # Verify there is a new running master by getting its PID and comparing it
|
||||
## DGM # with the PID from before the upgrade
|
||||
## DGM new_pid = []
|
||||
## DGM for proc in psutil.process_iter():
|
||||
## DGM if salt_name in proc.name():
|
||||
## DGM cmdl_strg = " ".join(str(element) for element in proc.cmdline())
|
||||
## DGM if process_name in cmdl_strg:
|
||||
## DGM new_pid.append(proc.pid)
|
||||
## DGM
|
||||
## DGM assert new_pid
|
||||
## DGM assert new_pid != old_pid
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue