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

Increase timeout for the minion swarm scenario tests

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2022-12-01 19:09:53 +00:00 • committed by Pedro Algarvio
parent eb4aeab301
commit 14fdaf1690
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
tests/pytests/scenarios/swarm/test_minion_swarm.py
View file

@ -1,27 +1,25 @@
import random
import pytest
from pytestshellutils.exceptions import FactoryTimeout
from salt.utils.platform import spawning_platform
import salt.utils.platform
pytestmark = [pytest.mark.slow_test]
pytestmark = [
pytest.mark.slow_test,
]
def run_salt_cmd(salt_cli, *args, **kwargs):
timeout = salt_cli.timeout
if spawning_platform():
timeout = salt_cli.timeout * 2
kwargs["_timeout"] = timeout
try:
return salt_cli.run(*args, **kwargs)
except FactoryTimeout:
if spawning_platform():
pytest.skip("Salt command timed out, skipping on spawning platform")
@pytest.fixture(scope="module")
def swarm_timeout():
timeout = 120
if salt.utils.platform.spawning_platform():
timeout *= 2
return timeout
def test_ping(minion_swarm, salt_cli):
ret = run_salt_cmd(salt_cli, "test.ping", minion_tgt="*")
def test_ping(minion_swarm, salt_cli, swarm_timeout):
ret = salt_cli.run("test.ping", minion_tgt="*", _timeout=swarm_timeout)
assert ret.returncode == 0
assert ret.data
for minion in minion_swarm:
assert minion.id in ret.data
@ -32,7 +30,8 @@ def test_ping(minion_swarm, salt_cli):
assert ret.data[minion.id] is True
def test_ping_one(minion_swarm, salt_cli):
def test_ping_one(minion_swarm, salt_cli, swarm_timeout):
minion = random.choice(minion_swarm)
ret = run_salt_cmd(salt_cli, "test.ping", minion_tgt=minion.id)
ret = salt_cli.run("test.ping", minion_tgt=minion.id, _timeout=swarm_timeout)
assert ret.returncode == 0
assert ret.data is True