mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Skip problematic tests in Fedora 40
Refs https://github.com/saltstack/salt/issues/66539 Refs https://github.com/saltstack/salt/issues/66540
This commit is contained in:
parent
34439f7750
commit
5a85699c8b
2 changed files with 6 additions and 2 deletions
|
@ -89,7 +89,9 @@ def peer_salt_minion_3(peer_salt_master):
|
|||
@pytest.mark.parametrize(
|
||||
"source,target", ((x, y) for x in range(1, 4) for y in range(1, 4) if x != y)
|
||||
)
|
||||
def test_peer_communication(source, target, request):
|
||||
def test_peer_communication(source, target, request, grains):
|
||||
if grains["os"] == "Fedora" and grains["osmajorrelease"] >= 40:
|
||||
pytest.skip(f"Temporary skip on {grains['osfinger']}")
|
||||
cli = request.getfixturevalue(f"peer_salt_minion_{source}").salt_call_cli()
|
||||
tgt = request.getfixturevalue(f"peer_salt_minion_{target}").id
|
||||
ret = cli.run("publish.publish", tgt, "test.ping")
|
||||
|
|
|
@ -108,8 +108,10 @@ def test_grains_append_val_is_list(salt_call_cli, append_grain):
|
|||
|
||||
@pytest.mark.timeout_unless_on_windows(300)
|
||||
def test_grains_remove_add(
|
||||
salt_call_cli, append_grain, wait_for_pillar_refresh_complete
|
||||
salt_call_cli, append_grain, wait_for_pillar_refresh_complete, grains
|
||||
):
|
||||
if grains["os"] == "Fedora" and grains["osmajorrelease"] >= 40:
|
||||
pytest.skip(f"Temporary skip on {grains['osfinger']}")
|
||||
second_grain = append_grain.value + "-2"
|
||||
ret = salt_call_cli.run("grains.get", append_grain.key)
|
||||
assert ret.returncode == 0
|
||||
|
|
Loading…
Add table
Reference in a new issue