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

Remove skips targeting PhotonOS 3

Browse source
This commit is contained in:
Pedro Algarvio 2024-02-22 15:42:43 +00:00
parent 5f48635fe8
commit 3978817195
3 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/pytests/integration/modules/test_virt.py
View file

@ -418,13 +418,11 @@ class TestVirtMigrateTest:
assert domains == []
def test_ssh_migration(
self, salt_cli, virt_minion_0, virt_minion_1, prep_virt, virt_domain, grains
self, salt_cli, virt_minion_0, virt_minion_1, prep_virt, virt_domain
):
"""
Test domain migration over SSH, TCP and TLS transport protocol
"""
if grains["os"] == "VMware Photon OS" and grains["osmajorrelease"] == 3:
pytest.skip("Skipping this test on PhotonOS 3")
ret = salt_cli.run("virt.list_active_vms", minion_tgt=virt_minion_0.id)
assert ret.returncode == 0, ret

4
tests/pytests/integration/netapi/test_ssh_client.py
View file

@ -137,13 +137,11 @@ def test_ssh_disabled(client, auth_creds):
@pytest.mark.timeout_unless_on_windows(360)
def test_shell_inject_ssh_priv(
client, salt_ssh_roster_file, rosters_dir, tmp_path, salt_auto_account, grains
client, salt_ssh_roster_file, rosters_dir, tmp_path, salt_auto_account
):
"""
Verify CVE-2020-16846 for ssh_priv variable
"""
if grains["os"] == "VMware Photon OS" and grains["osmajorrelease"] == 3:
pytest.skip("Skipping problematic test on PhotonOS 3")
# ZDI-CAN-11143
path = tmp_path / "test-11143"
tgts = ["repo.saltproject.io", "www.zerodayinitiative.com"]

4
tests/pytests/unit/cloud/test_map.py
View file

@ -101,12 +101,10 @@ def salt_cloud_config_file(salt_master_factory):
# The cloud map merge uses python's multiprocessing manager which authenticates using HMAC and MD5
@pytest.mark.skip_on_fips_enabled_platform
def test_cloud_map_merge_conf(salt_cloud_config_file, grains):
def test_cloud_map_merge_conf(salt_cloud_config_file):
"""
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)):