Updated test to run on Linux only

This commit is contained in:
David Murphy 2024-06-26 15:05:15 -06:00 committed by Daniel Wozniak
parent 1e4509fd7d
commit 0d1d9a1649
9 changed files with 24 additions and 13 deletions

View file

@ -1,8 +1,11 @@
import pytest
from pytestskipmarkers.utils import platform
pytestmark = [
pytest.mark.unless_on_linux,
]
@pytest.mark.skip_on_windows(reason="Linux test only")
def test_services(install_salt, salt_call_cli):
"""
Check if Services are enabled/disabled

View file

@ -1,14 +1,19 @@
import pytest
pytestmark = [
pytest.mark.skip_on_windows,
pytest.mark.unless_on_linux,
]
def test_salt_api(api_request, salt_master):
def test_salt_api(api_request, salt_master, install_salt):
"""
Test running a command against the salt api
"""
if install_salt.distro_id in ("ubuntu", "debian"):
pytest.skip(
"Package test are getting reworked in https://github.com/saltstack/salt/issues/66672"
)
assert salt_master.is_running()
ret = api_request.post(

View file

@ -3,6 +3,10 @@ import subprocess
import pytest
from pytestskipmarkers.utils import platform
pytestmark = [
pytest.mark.unless_on_linux,
]
def test_salt_call_local(salt_call_cli):
"""

View file

@ -3,7 +3,7 @@ from sys import platform
import pytest
pytestmark = [
pytest.mark.skip_on_windows,
pytest.mark.unless_on_linux,
]

View file

@ -1,7 +1,7 @@
import pytest
pytestmark = [
pytest.mark.skip_on_windows,
pytest.mark.unless_on_linux,
]

View file

@ -1,7 +1,7 @@
import pytest
pytestmark = [
pytest.mark.skip_on_windows,
pytest.mark.unless_on_linux,
]

View file

@ -1,7 +1,7 @@
import pytest
pytestmark = [
pytest.mark.skip_on_windows,
pytest.mark.unless_on_linux,
]

View file

@ -6,7 +6,7 @@ from pytestskipmarkers.utils import platform
from saltfactories.utils.functional import MultiStateResult
pytestmark = [
pytest.mark.skip_on_windows,
pytest.mark.unless_on_linux,
]

View file

@ -5,8 +5,11 @@ import subprocess
import pytest
from pytestskipmarkers.utils import platform
pytestmark = [
pytest.mark.unless_on_linux,
]
@pytest.mark.skip_on_windows
def test_salt_version(version, install_salt):
"""
Test version output from salt --version
@ -34,7 +37,6 @@ def test_salt_version(version, install_salt):
assert actual == expected
@pytest.mark.skip_on_windows
def test_salt_versions_report_master(install_salt):
"""
Test running --versions-report on master
@ -55,7 +57,6 @@ def test_salt_versions_report_master(install_salt):
ret.stdout.matcher.fnmatch_lines([f"*{py_version}*"])
@pytest.mark.skip_on_windows
def test_salt_versions_report_minion(salt_cli, salt_call_cli, salt_minion):
"""
Test running test.versions_report on minion
@ -106,7 +107,6 @@ def test_compare_versions(version, binary, install_salt):
)
@pytest.mark.skip_unless_on_darwin()
@pytest.mark.parametrize(
"symlink",
[
@ -138,7 +138,6 @@ def test_symlinks_created(version, symlink, install_salt):
ret.stdout.matcher.fnmatch_lines([f"*{version}*"])
@pytest.mark.skip_on_windows()
def test_compare_pkg_versions_redhat_rc(version, install_salt):
"""
Test compare pkg versions for redhat RC packages. A tilde should be included