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

removing from integration in favor of the in functional tests

Browse source
This commit is contained in:
Gareth J. Greenaway 2023-05-01 20:47:43 -07:00 • committed by Megan Wilhite
parent 418d575bb4
commit beaa9ee3a5
1 changed files with 0 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

127
tests/pytests/integration/cli/test_salt_deltaproxy.py
View file

@ -4,7 +4,6 @@
import logging
import os
import random
import pytest
from pytestshellutils.exceptions import FactoryNotStarted
@ -722,129 +721,3 @@ def ping():
# Terminate the proxy minion
ret = factory.terminate()
assert ret.returncode == salt.defaults.exitcodes.EX_OK, ret
# Hangs on Windows. You can add a timeout to the proxy.run command, but then
# it just times out.
@pytest.mark.skip_on_windows(reason=PRE_PYTEST_SKIP_REASON)
@pytest.mark.parametrize(
"parallel_startup",
[True, False],
ids=["parallel_startup=True", "parallel_startup=False"],
)
def test_exit_status_correct_usage_large_number_of_minions(
salt_master,
salt_cli,
proxy_minion_id,
parallel_startup,
):
"""
Ensure the salt-proxy control proxy starts and
is able to respond to test.ping, additionally ensure that
the proxies being controlled also respond to test.ping.
Finally ensure correct exit status when salt-proxy exits correctly.
Skip on Windows because daemonization not supported
"""
config_defaults = {
"metaproxy": "deltaproxy",
}
sub_proxies = [
"proxy_one",
"proxy_two",
"proxy_three",
"proxy_four",
"proxy_five",
"proxy_six",
"proxy_seven",
"proxy_eight",
"proxy_nine",
"proxy_ten",
"proxy_eleven",
"proxy_twelve",
"proxy_thirteen",
"proxy_fourteen",
"proxy_fifteen",
"proxy_sixteen",
]
top_file = """
base:
{control}:
- controlproxy
""".format(
control=proxy_minion_id,
)
controlproxy_pillar_file = """
proxy:
proxytype: deltaproxy
parallel_startup: {}
ids:
""".format(
parallel_startup
)
dummy_proxy_pillar_file = """
proxy:
proxytype: dummy
"""
for minion_id in sub_proxies:
top_file += """
{minion_id}:
- dummy""".format(
minion_id=minion_id,
)
controlproxy_pillar_file += """
- {}
""".format(
minion_id,
)
top_tempfile = salt_master.pillar_tree.base.temp_file("top.sls", top_file)
controlproxy_tempfile = salt_master.pillar_tree.base.temp_file(
"controlproxy.sls", controlproxy_pillar_file
)
dummy_proxy_tempfile = salt_master.pillar_tree.base.temp_file(
"dummy.sls",
dummy_proxy_pillar_file,
)
with top_tempfile, controlproxy_tempfile, dummy_proxy_tempfile:
factory = salt_master.salt_proxy_minion_daemon(
proxy_minion_id,
defaults=config_defaults,
extra_cli_arguments_after_first_start_failure=["--log-level=info"],
start_timeout=240,
)
for minion_id in [proxy_minion_id] + sub_proxies:
factory.before_start(
pytest.helpers.remove_stale_proxy_minion_cache_file, factory, minion_id
)
factory.after_terminate(
pytest.helpers.remove_stale_minion_key, salt_master, minion_id
)
factory.after_terminate(
pytest.helpers.remove_stale_proxy_minion_cache_file, factory, minion_id
)
with factory.started():
assert factory.is_running()
# Let's issue a ping the control proxy
ret = salt_cli.run("test.ping", minion_tgt=proxy_minion_id)
assert ret.returncode == 0
assert ret.data is True
for minion_id in random.sample(sub_proxies, 4):
# Let's issue a ping to one of the controlled proxies
ret = salt_cli.run("test.ping", minion_tgt=minion_id)
assert ret.returncode == 0
assert ret.data is True
# Terminate the proxy minion
ret = factory.terminate()
assert ret.returncode == salt.defaults.exitcodes.EX_OK, ret