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

Merge 3006.x into 3007.x

Browse source
This commit is contained in:
Pedro Algarvio 2024-04-03 09:19:40 +01:00
commit a5a0a13e6e
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
5 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/pytests/functional/channel/test_req_channel.py
View file

@ -23,6 +23,10 @@ pytestmark = [
reason="These tests are currently broken on spawning platforms. Need to be rewritten.",
),
pytest.mark.slow_test,
pytest.mark.skipif(
"grains['osfinger'] == 'Rocky Linux-8' and grains['osarch'] == 'aarch64'",
reason="Temporarily skip on Rocky Linux 8 Arm64",
),
]

4
tests/pytests/functional/transport/ipc/test_pub_server_channel.py
View file

@ -18,6 +18,10 @@ pytestmark = [
pytest.mark.skip_on_spawning_platform(
reason="These tests are currently broken on spawning platforms. Need to be rewritten.",
),
pytest.mark.skipif(
"grains['osfinger'] == 'Rocky Linux-8' and grains['osarch'] == 'aarch64'",
reason="Temporarily skip on Rocky Linux 8 Arm64",
),
]

4
tests/pytests/functional/transport/zeromq/test_pub_server_channel.py
View file

@ -24,6 +24,10 @@ pytestmark = [
pytest.mark.skip_on_spawning_platform(
reason="These tests are currently broken on spawning platforms. Need to be rewritten.",
),
pytest.mark.skipif(
"grains['osfinger'] == 'Rocky Linux-8' and grains['osarch'] == 'aarch64'",
reason="Temporarily skip on Rocky Linux 8 Arm64",
),
]

4
tests/pytests/functional/utils/test_process.py
View file

@ -24,6 +24,10 @@ def process_manager():
_process_manager.terminate()
@pytest.mark.skipif(
"grains['osfinger'] == 'Rocky Linux-8' and grains['osarch'] == 'aarch64'",
reason="Temporarily skip on Rocky Linux 8 Arm64",
)
def test_process_manager_60749(process_manager):
"""
Regression test for issue #60749

4
tests/pytests/functional/utils/user/test_chugid_and_umask.py
View file

@ -20,6 +20,10 @@ pytestmark = [
pytest.mark.skip_if_not_root,
pytest.mark.skip_on_windows,
pytest.mark.skip_initial_gh_actions_failure(skip=_check_skip),
pytest.mark.skipif(
"grains['osfinger'] == 'Rocky Linux-8' and grains['osarch'] == 'aarch64'",
reason="Temporarily skip on Rocky Linux 8 Arm64",
),
]