mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Added more tests for enabled, disabled, inactive and active, ownership wip
This commit is contained in:
David Murphy
Daniel Wozniak
parent
b3cc75e5de
commit
85c77e65b0
1 changed files with 342 additions and 57 deletions
|
|
@ -31,6 +31,73 @@ def salt_systemd_setup(
|
|||
assert ret.returncode == 0
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def salt_test_upgrade(
|
||||
salt_call_cli,
|
||||
install_salt,
|
||||
):
|
||||
"""
|
||||
Test upgrade of Salt packages for Minion and Master
|
||||
"""
|
||||
# Verify previous install version salt-minion is setup correctly and works
|
||||
ret = salt_call_cli.run("--local", "test.version")
|
||||
assert ret.returncode == 0
|
||||
installed_minion_version = packaging.version.parse(ret.data)
|
||||
assert installed_minion_version < packaging.version.parse(
|
||||
install_salt.artifact_version
|
||||
)
|
||||
|
||||
# Verify previous install version salt-master 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 minion and master by getting there PIDs
|
||||
process_master_name = "salt-master"
|
||||
if platform.is_windows():
|
||||
process_minion_name = "salt-minion.exe"
|
||||
else:
|
||||
process_minion_name = "salt-minion"
|
||||
|
||||
old_minion_pids = _get_running_named_salt_pid(process_minion_name)
|
||||
old_master_pids = _get_running_named_salt_pid(process_master_name)
|
||||
assert old_minion_pids
|
||||
assert old_master_pids
|
||||
|
||||
# Upgrade Salt (inc. minion, master, etc.) from previous version and test
|
||||
install_salt.install(upgrade=True)
|
||||
|
||||
time.sleep(60) # give it some time
|
||||
|
||||
ret = salt_call_cli.run("--local", "test.version")
|
||||
assert ret.returncode == 0
|
||||
|
||||
installed_minion_version = packaging.version.parse(ret.data)
|
||||
assert installed_minion_version == packaging.version.parse(
|
||||
install_salt.artifact_version
|
||||
)
|
||||
|
||||
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 new running minion and master by getting their PID and comparing them
|
||||
# with previous PIDs from before the upgrade
|
||||
|
||||
new_minion_pids = _get_running_named_salt_pid(process_minion_name)
|
||||
new_master_pids = _get_running_named_salt_pid(process_master_name)
|
||||
|
||||
assert new_minion_pids
|
||||
assert new_master_pids
|
||||
assert new_minion_pids != old_minion_pids
|
||||
assert new_master_pids != old_master_pids
|
||||
|
||||
|
||||
def _get_running_named_salt_pid(
|
||||
process_name,
|
||||
): # pylint: disable=logging-fstring-interpolation
|
||||
|
|
@ -59,22 +126,6 @@ def test_salt_upgrade(salt_call_cli, install_salt):
|
|||
if install_salt.relenv:
|
||||
original_py_version = install_salt.package_python_version()
|
||||
|
||||
# Verify previous install version salt-minion is setup correctly and works
|
||||
ret = salt_call_cli.run("--local", "test.version")
|
||||
assert ret.returncode == 0
|
||||
installed_minion_version = packaging.version.parse(ret.data)
|
||||
assert installed_minion_version < packaging.version.parse(
|
||||
install_salt.artifact_version
|
||||
)
|
||||
|
||||
# Verify previous install version salt-master 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)
|
||||
|
||||
# Test pip install before an upgrade
|
||||
dep = "PyGithub==1.56.0"
|
||||
install = salt_call_cli.run("--local", "pip.install", dep)
|
||||
|
|
@ -85,47 +136,9 @@ def test_salt_upgrade(salt_call_cli, install_salt):
|
|||
use_lib = salt_call_cli.run("--local", "github.get_repo_info", repo)
|
||||
assert "Authentication information could" in use_lib.stderr
|
||||
|
||||
# Verify there is a running minion and master by getting there PIDs
|
||||
process_master_name = "salt-master"
|
||||
if platform.is_windows():
|
||||
process_minion_name = "salt-minion.exe"
|
||||
else:
|
||||
process_minion_name = "salt-minion"
|
||||
|
||||
old_minion_pids = _get_running_named_salt_pid(process_minion_name)
|
||||
old_master_pids = _get_running_named_salt_pid(process_master_name)
|
||||
assert old_minion_pids
|
||||
assert old_master_pids
|
||||
|
||||
# Upgrade Salt (inc. minion, master, etc.) from previous version and test
|
||||
install_salt.install(upgrade=True)
|
||||
|
||||
time.sleep(6) # give it some time
|
||||
|
||||
ret = salt_call_cli.run("--local", "test.version")
|
||||
assert ret.returncode == 0
|
||||
|
||||
installed_minion_version = packaging.version.parse(ret.data)
|
||||
assert installed_minion_version == packaging.version.parse(
|
||||
install_salt.artifact_version
|
||||
)
|
||||
|
||||
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 new running minion and master by getting their PID and comparing them
|
||||
# with previous PIDs from before the upgrade
|
||||
|
||||
new_minion_pids = _get_running_named_salt_pid(process_minion_name)
|
||||
new_master_pids = _get_running_named_salt_pid(process_master_name)
|
||||
|
||||
assert new_minion_pids
|
||||
assert new_master_pids
|
||||
assert new_minion_pids != old_minion_pids
|
||||
assert new_master_pids != old_master_pids
|
||||
# perform Salt package upgrade test
|
||||
# pylint: disable=pointless-statement
|
||||
salt_test_upgrade
|
||||
|
||||
if install_salt.relenv:
|
||||
new_py_version = install_salt.package_python_version()
|
||||
|
|
@ -247,3 +260,275 @@ def test_salt_wrk(
|
|||
assert test_group == "root"
|
||||
else:
|
||||
assert test_group == "salt"
|
||||
|
||||
|
||||
@pytest.mark.skip_unless_on_linux(reason="Only supported on Linux family")
|
||||
def test_salt_systemd_disabled_preservation(
|
||||
salt_call_cli, install_salt, salt_systemd_setup
|
||||
): # pylint: disable=logging-fstring-interpolation
|
||||
"""
|
||||
Test upgrade of Salt packages preserve disabled state of systemd
|
||||
"""
|
||||
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()
|
||||
|
||||
# setup systemd to enabled and active for Salt packages
|
||||
# pylint: disable=pointless-statement
|
||||
salt_systemd_setup
|
||||
|
||||
# ensure known state, disabled
|
||||
test_list = ["salt-api", "salt-minion", "salt-master"]
|
||||
for test_item in test_list:
|
||||
test_cmd = f"systemctl disable {test_item}"
|
||||
ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
assert ret.returncode == 0
|
||||
|
||||
# perform Salt package upgrade test
|
||||
# pylint: disable=pointless-statement
|
||||
salt_test_upgrade
|
||||
|
||||
# test for disabled systemd state
|
||||
test_list = ["salt-api", "salt-minion", "salt-master"]
|
||||
for test_item in test_list:
|
||||
test_cmd = f"systemctl show -p UnitFileState {test_item}"
|
||||
ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
print(
|
||||
f"DGM salt_systemd_setup, '{test_item}' systemctl disabled test, ret '{ret}'",
|
||||
flush=True,
|
||||
)
|
||||
test_enabled = ret.stdout.strip().split("=")[1].split('"')[0].strip()
|
||||
print(
|
||||
f"DGM salt_systemd_setup, '{test_item}' systemctl disabled test produced, line '{ret.stdout.strip().split('=')}', result '{test_enabled}'",
|
||||
flush=True,
|
||||
)
|
||||
assert ret.returncode == 0
|
||||
assert test_enabled == "disabled"
|
||||
|
||||
|
||||
@pytest.mark.skip_unless_on_linux(reason="Only supported on Linux family")
|
||||
def test_salt_systemd_enabled_preservation(
|
||||
salt_call_cli, install_salt, salt_systemd_setup
|
||||
): # pylint: disable=logging-fstring-interpolation
|
||||
"""
|
||||
Test upgrade of Salt packages preserve enabled state of systemd
|
||||
"""
|
||||
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()
|
||||
|
||||
# setup systemd to enabled and active for Salt packages
|
||||
# pylint: disable=pointless-statement
|
||||
salt_systemd_setup
|
||||
|
||||
# perform Salt package upgrade test
|
||||
# pylint: disable=pointless-statement
|
||||
salt_test_upgrade
|
||||
|
||||
# test for enabled systemd state
|
||||
test_list = ["salt-api", "salt-minion", "salt-master"]
|
||||
for test_item in test_list:
|
||||
test_cmd = f"systemctl show -p UnitFileState {test_item}"
|
||||
ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
print(
|
||||
f"DGM salt_systemd_setup, '{test_item}' systemctl enabled test, ret '{ret}'",
|
||||
flush=True,
|
||||
)
|
||||
test_enabled = ret.stdout.strip().split("=")[1].split('"')[0].strip()
|
||||
print(
|
||||
f"DGM salt_systemd_setup, '{test_item}' systemctl enabled test produced, line '{ret.stdout.strip().split('=')}', result '{test_enabled}'",
|
||||
flush=True,
|
||||
)
|
||||
assert ret.returncode == 0
|
||||
assert test_enabled == "enabled"
|
||||
|
||||
|
||||
@pytest.mark.skip_unless_on_linux(reason="Only supported on Linux family")
|
||||
def test_salt_systemd_inactive_preservation(
|
||||
salt_call_cli, install_salt, salt_systemd_setup
|
||||
): # pylint: disable=logging-fstring-interpolation
|
||||
"""
|
||||
Test upgrade of Salt packages preserve inactive state of systemd
|
||||
"""
|
||||
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()
|
||||
|
||||
# setup systemd to enabled and active for Salt packages
|
||||
# pylint: disable=pointless-statement
|
||||
salt_systemd_setup
|
||||
|
||||
# ensure known state, disabled
|
||||
test_list = ["salt-api", "salt-minion", "salt-master"]
|
||||
for test_item in test_list:
|
||||
test_cmd = f"systemctl stop {test_item}"
|
||||
ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
assert ret.returncode == 0
|
||||
|
||||
# perform Salt package upgrade test
|
||||
# pylint: disable=pointless-statement
|
||||
salt_test_upgrade
|
||||
|
||||
# test for inactive systemd state
|
||||
test_list = ["salt-api", "salt-minion", "salt-master"]
|
||||
for test_item in test_list:
|
||||
test_cmd = f"systemctl is-active {test_item}"
|
||||
ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
print(
|
||||
f"DGM salt_systemd_setup, '{test_item}' systemctl inactive test, ret '{ret}'",
|
||||
flush=True,
|
||||
)
|
||||
test_active = ret.stdout.strip().split()[2].strip('"').strip()
|
||||
print(
|
||||
f"DGM salt_systemd_setup, '{test_item}' systemctl inactive test produced, line '{ret.stdout.strip().split()}', result '{test_active}'",
|
||||
flush=True,
|
||||
)
|
||||
assert ret.returncode == 0
|
||||
assert test_active == "inactive"
|
||||
|
||||
|
||||
@pytest.mark.skip_unless_on_linux(reason="Only supported on Linux family")
|
||||
def test_salt_systemd_active_preservation(
|
||||
salt_call_cli, install_salt, salt_systemd_setup
|
||||
): # pylint: disable=logging-fstring-interpolation
|
||||
"""
|
||||
Test upgrade of Salt packages preserve active state of systemd
|
||||
"""
|
||||
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()
|
||||
|
||||
# setup systemd to enabled and active for Salt packages
|
||||
# pylint: disable=pointless-statement
|
||||
salt_systemd_setup
|
||||
|
||||
# perform Salt package upgrade test
|
||||
# pylint: disable=pointless-statement
|
||||
salt_test_upgrade
|
||||
|
||||
# test for active systemd state
|
||||
test_list = ["salt-api", "salt-minion", "salt-master"]
|
||||
for test_item in test_list:
|
||||
test_cmd = f"systemctl is-active {test_item}"
|
||||
ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
print(
|
||||
f"DGM salt_systemd_setup, '{test_item}' systemctl active test, ret '{ret}'",
|
||||
flush=True,
|
||||
)
|
||||
test_active = ret.stdout.strip().split()[2].strip('"').strip()
|
||||
print(
|
||||
f"DGM salt_systemd_setup, '{test_item}' systemctl active test produced, line '{ret.stdout.strip().split()}', result '{test_active}'",
|
||||
flush=True,
|
||||
)
|
||||
assert ret.returncode == 0
|
||||
assert test_active == "active"
|
||||
|
||||
|
||||
@pytest.mark.skip_unless_on_linux(reason="Only supported on Linux family")
|
||||
def test_salt_ownership_premission(
|
||||
salt_call_cli, install_salt, salt_systemd_setup
|
||||
): # pylint: disable=logging-fstring-interpolation
|
||||
"""
|
||||
Test upgrade of Salt packages preserve existing ownership
|
||||
"""
|
||||
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()
|
||||
|
||||
# setup systemd to enabled and active for Salt packages
|
||||
# pylint: disable=pointless-statement
|
||||
salt_systemd_setup
|
||||
|
||||
# ensure known ownership
|
||||
# TBD DGM need to create master user, and minion user, change conf, restart and test ownership
|
||||
|
||||
# restart and check ownership is correct
|
||||
test_list = ["salt-api", "salt-minion", "salt-master"]
|
||||
for test_item in test_list:
|
||||
test_cmd = f"systemctl restart {test_item}"
|
||||
ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
assert ret.returncode == 0
|
||||
|
||||
# perform Salt package upgrade test
|
||||
# pylint: disable=pointless-statement
|
||||
salt_test_upgrade
|
||||
|
||||
# test ownership for Minion, Master and Api
|
||||
test_list = ["salt-api", "salt-minion", "salt-master"]
|
||||
for test_item in test_list:
|
||||
if "salt-api" == test_item:
|
||||
test_cmd = f"ls -dl /run/{test_item}.pid"
|
||||
ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
print(
|
||||
f"DGM salt_systemd_setup, '{test_item}' user test, ret '{ret}'",
|
||||
flush=True,
|
||||
)
|
||||
test_user = ret.stdout.strip().split()[4]
|
||||
print(
|
||||
f"DGM salt_systemd_setup, '{test_item}' user test, line '{ret.stdout.strip().split()}', user '{test_user}'",
|
||||
flush=True,
|
||||
)
|
||||
assert ret.returncode == 0
|
||||
# TBD DGM NEED TO CHANGE ASSERT TO CORRECT USER
|
||||
assert test_user == "salt"
|
||||
|
||||
test_cmd = f"ls -dl /run/{test_item}.pid"
|
||||
ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
print(
|
||||
f"DGM salt_systemd_setup, '{test_item}' group test, ret '{ret}'",
|
||||
flush=True,
|
||||
)
|
||||
test_group = ret.stdout.strip().split()[5]
|
||||
print(
|
||||
f"DGM salt_systemd_setup, '{test_item}' group test, line '{ret.stdout.strip().split()}', group '{test_group}'",
|
||||
flush=True,
|
||||
)
|
||||
assert ret.returncode == 0
|
||||
# TBD DGM NEED TO CHANGE ASSERT TO CORRECT USER
|
||||
assert test_group == "salt"
|
||||
else:
|
||||
test_name = test_item.strip().split("-")[1]
|
||||
test_cmd = f"ls -dl /run/salt/{test_name}"
|
||||
ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
print(
|
||||
f"DGM salt_systemd_setup, '{test_item}' user test, ret '{ret}'",
|
||||
flush=True,
|
||||
)
|
||||
test_user = ret.stdout.strip().split()[4]
|
||||
print(
|
||||
f"DGM salt_systemd_setup, '{test_item}' user test, line '{ret.stdout.strip().split()}', user '{test_user}'",
|
||||
flush=True,
|
||||
)
|
||||
assert ret.returncode == 0
|
||||
# TBD DGM NEED TO CHANGE ASSERT TO CORRECT USER
|
||||
if test_item == "salt-minion":
|
||||
assert test_user == "root"
|
||||
else:
|
||||
assert test_user == "salt"
|
||||
|
||||
ret = salt_call_cli.run("--local", "cmd.run", test_cmd)
|
||||
print(
|
||||
f"DGM salt_systemd_setup, '{test_item}' group test, ret '{ret}'",
|
||||
flush=True,
|
||||
)
|
||||
test_group = ret.stdout.strip().split()[5]
|
||||
print(
|
||||
f"DGM salt_systemd_setup, '{test_item}' group test, line '{ret.stdout.strip().split()}', group '{test_group}'",
|
||||
flush=True,
|
||||
)
|
||||
assert ret.returncode == 0
|
||||
# TBD DGM NEED TO CHANGE ASSERT TO CORRECT USER
|
||||
if test_item == "salt-minion":
|
||||
assert test_group == "root"
|
||||
else:
|
||||
assert test_group == "salt"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue