Reverts changes to test_transactional_update

This commit is contained in:
Marek Czernek 2024-07-22 16:01:24 +02:00 committed by Daniel Wozniak
parent c0354fc161
commit 7a871376a2

View file

@ -1,6 +1,3 @@
import os
import sys
import pytest
import salt.loader.context
@ -13,10 +10,6 @@ pytestmark = [
pytest.mark.skip_on_windows(reason="Not supported on Windows"),
]
SALT_CALL_BINARY = "salt-call"
if os.environ.get("VIRTUAL_ENV") and os.environ.get("VIRTUAL_ENV") in sys.executable:
SALT_CALL_BINARY = f"{os.environ.get('VIRTUAL_ENV')}/bin/salt-call"
@pytest.fixture
def configure_loader_modules():
@ -388,7 +381,7 @@ def test_call_fails_function():
"--continue",
"--quiet",
"run",
SALT_CALL_BINARY,
"salt-call",
"--out",
"json",
"-l",
@ -420,7 +413,7 @@ def test_call_success_no_reboot():
"--continue",
"--quiet",
"run",
SALT_CALL_BINARY,
"salt-call",
"--out",
"json",
"-l",
@ -463,7 +456,7 @@ def test_call_success_reboot():
"--continue",
"--quiet",
"run",
SALT_CALL_BINARY,
"salt-call",
"--out",
"json",
"-l",
@ -497,7 +490,7 @@ def test_call_success_parameters():
"--continue",
"--quiet",
"run",
SALT_CALL_BINARY,
"salt-call",
"--out",
"json",
"-l",