From 5a85699c8b42700830641107d6190899ffb3dca5 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 17 May 2024 11:15:13 +0100 Subject: [PATCH] Skip problematic tests in Fedora 40 Refs https://github.com/saltstack/salt/issues/66539 Refs https://github.com/saltstack/salt/issues/66540 --- tests/pytests/integration/master/test_peer.py | 4 +++- tests/pytests/integration/modules/grains/test_append.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/pytests/integration/master/test_peer.py b/tests/pytests/integration/master/test_peer.py index 8ac9fdef4e7..38f44c2abf0 100644 --- a/tests/pytests/integration/master/test_peer.py +++ b/tests/pytests/integration/master/test_peer.py @@ -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") diff --git a/tests/pytests/integration/modules/grains/test_append.py b/tests/pytests/integration/modules/grains/test_append.py index 0338d93ae51..3634254ed43 100644 --- a/tests/pytests/integration/modules/grains/test_append.py +++ b/tests/pytests/integration/modules/grains/test_append.py @@ -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