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 4

swap out load beacon for status beacon which is a bit more predictable when it will fire.

Browse source
This commit is contained in:
Gareth J. Greenaway 2023-09-05 16:45:26 -07:00 • committed by Megan Wilhite
parent 21a2898313
commit bc7c3f325d
1 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
tests/pytests/integration/modules/test_pillar.py
View file

@ -614,7 +614,9 @@ def test_pillar_refresh_pillar_beacons(
event_listerner_timeout,
):
"""
Ensure beacons jobs in pillar are only updated when values change.
Ensure beacons jobs in pillar are started after
a pillar refresh and then not running when pillar
is cleared.
"""
top_sls = """
@ -629,23 +631,9 @@ def test_pillar_refresh_pillar_beacons(
test_beacons_sls = """
beacons:
load:
- averages:
1m:
- 0.0
- 5.0
5m:
- 0.0
- 5.0
15m:
- 0.0
- 5.0
- emitatstartup: True
- onchangeonly: False
"""
test_beacons_sls2 = """
beacons: {}
status:
- loadavg:
- 1-min
"""
assert salt_minion.is_running()
@ -673,7 +661,7 @@ def test_pillar_refresh_pillar_beacons(
# Give the beacons a chance to start
time.sleep(5)
event_tag = f"salt/beacon/*/load/"
event_tag = f"salt/beacon/*/status/*"
start_time = time.time()
event_pattern = (salt_master.id, event_tag)
@ -697,14 +685,14 @@ def test_pillar_refresh_pillar_beacons(
# Give the beacons a chance to stop
time.sleep(5)
event_tag = f"salt/beacon/*/load/"
event_tag = f"salt/beacon/*/status/*"
start_time = time.time()
event_pattern = (salt_master.id, event_tag)
matched_events = event_listener.wait_for_events(
[event_pattern],
after_time=start_time,
timeout=event_listerner_timeout.catch,
timeout=event_listerner_timeout.miss,
)
assert not matched_events.found_all_events