mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Skip state test on Windows
This commit is contained in:
parent
559ad14f54
commit
293f6b2d02
2 changed files with 5 additions and 1 deletions
|
@ -464,7 +464,7 @@ def setup_windows(
|
|||
try:
|
||||
arch = os.environ.get("SALT_REPO_ARCH") or "amd64"
|
||||
if package_type != "onedir":
|
||||
root_dir = pathlib.Path(r"C:\Program Files\Salt Project\Salt")
|
||||
root_dir = pathlib.Path(os.getenv("ProgramFiles"), "Salt Project", "Salt")
|
||||
|
||||
if packaging.version.parse(salt_release) > packaging.version.parse("3005"):
|
||||
if package_type.lower() == "nsis":
|
||||
|
|
|
@ -5,6 +5,10 @@ import pytest
|
|||
from pytestskipmarkers.utils import platform
|
||||
from saltfactories.utils.functional import MultiStateResult
|
||||
|
||||
pytestmark = [
|
||||
pytest.mark.skip_on_windows,
|
||||
]
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def files(tmp_path):
|
||||
|
|
Loading…
Add table
Reference in a new issue