saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'saltstack/3006.x' into merge-forward

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-12-17 14:58:34 -07:00
commit 0744177cd7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/pytests/integration/minion/test_return_retries.py
View file

@ -64,6 +64,7 @@ def test_pillar_timeout(salt_master_factory):
"auto_accept": True,
"worker_threads": 2,
"peer": True,
"minion_data_cache": False,
}
minion_overrides = {
"auth_timeout": 20,
@ -77,7 +78,7 @@ def test_pillar_timeout(salt_master_factory):
- name: example
- changes: True
- result: True
- comment: "Nothing has actually been changed"
- comment: "Nothing has actually been changed {{ pillar['foo'] }}"
"""
master = salt_master_factory.salt_master_daemon(
"pillar-timeout-master",
@ -103,6 +104,7 @@ def test_pillar_timeout(salt_master_factory):
sls_tempfile = master.state_tree.base.temp_file(f"{sls_name}.sls", sls_contents)
with master.started(), minion1.started(), minion2.started(), minion3.started(), minion4.started(), sls_tempfile:
proc = cli.run("state.sls", sls_name, minion_tgt="*")
print(proc)
# At least one minion should have a Pillar timeout
assert proc.returncode == 1
minion_timed_out = False