From 6638e51c199614a71dc3701d32e259872c472cda Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 22 Oct 2023 12:20:02 +0100 Subject: [PATCH] Skip test that hangs on PhotonOS 3 Signed-off-by: Pedro Algarvio --- tests/pytests/unit/cloud/test_map.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/pytests/unit/cloud/test_map.py b/tests/pytests/unit/cloud/test_map.py index 6cd836f0db8..06f71b6d6e5 100644 --- a/tests/pytests/unit/cloud/test_map.py +++ b/tests/pytests/unit/cloud/test_map.py @@ -99,10 +99,12 @@ def salt_cloud_config_file(salt_master_factory): return os.path.join(salt_master_factory.config_dir, "cloud") -def test_cloud_map_merge_conf(salt_cloud_config_file): +def test_cloud_map_merge_conf(salt_cloud_config_file, grains): """ Ensure that nested values can be selectivly overridden in a map file """ + if grains["os"] == "VMware Photon OS" and grains["osmajorrelease"] == 3: + pytest.skip("Test hangs on PhotonOS 3") with patch( "salt.config.check_driver_dependencies", MagicMock(return_value=True) ), patch("salt.cloud.Map.read", MagicMock(return_value=EXAMPLE_MAP)):