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

Make cluster tests more stable

Browse source
This commit is contained in:
Daniel A. Wozniak 2023-12-15 16:00:05 -07:00 • committed by Daniel Wozniak
parent dbeb44bdd4
commit 60a1d31e19
3 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tests/pytests/integration/cluster/conftest.py
View file

@ -45,6 +45,12 @@ def cluster_master_1(request, salt_factories, cluster_pki_path, cluster_cache_pa
],
"cluster_pki_dir": str(cluster_pki_path),
"cache_dir": str(cluster_cache_path),
"log_granular_levels": {
"salt": "info",
"salt.transport": "debug",
"salt.channel": "debug",
"salt.utils.event": "debug",
},
}
factory = salt_factories.salt_master_daemon(
"127.0.0.1",
@ -74,6 +80,12 @@ def cluster_master_2(salt_factories, cluster_master_1):
],
"cluster_pki_dir": cluster_master_1.config["cluster_pki_dir"],
"cache_dir": cluster_master_1.config["cache_dir"],
"log_granular_levels": {
"salt": "info",
"salt.transport": "debug",
"salt.channel": "debug",
"salt.utils.event": "debug",
},
}
# Use the same ports for both masters, they are binding to different interfaces
@ -110,6 +122,12 @@ def cluster_master_3(salt_factories, cluster_master_1):
],
"cluster_pki_dir": cluster_master_1.config["cluster_pki_dir"],
"cache_dir": cluster_master_1.config["cache_dir"],
"log_granular_levels": {
"salt": "info",
"salt.transport": "debug",
"salt.channel": "debug",
"salt.utils.event": "debug",
},
}
# Use the same ports for both masters, they are binding to different interfaces
@ -139,6 +157,12 @@ def cluster_minion_1(cluster_master_1):
config_overrides = {
"master": f"{addr}:{port}",
"test.foo": "baz",
"log_granular_levels": {
"salt": "info",
"salt.transport": "debug",
"salt.channel": "debug",
"salt.utils.event": "debug",
},
}
factory = cluster_master_1.salt_minion_daemon(
"cluster-minion-1",

3
tests/pytests/integration/cluster/test_basic_cluster.py
View file

@ -1,3 +1,6 @@
"""
Cluster integration tests.
"""
import salt.utils.event

5
tests/pytests/scenarios/cluster/test_cluster.py
View file

@ -1,3 +1,6 @@
"""
Cluster scinarios.
"""
import os
import pathlib
import time
@ -52,6 +55,8 @@ def test_cluster_key_rotation(
if time.monotonic() - start > timeout:
assert False, f"Drop file never removed {dfpath}"
time.sleep(30)
keys = set()
# Validate the aes session key for all masters match