From 7a871376a269efc8acc21eb17598ed75efca55ed Mon Sep 17 00:00:00 2001 From: Marek Czernek Date: Mon, 22 Jul 2024 16:01:24 +0200 Subject: [PATCH] Reverts changes to test_transactional_update --- .../unit/modules/test_transactional_update.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tests/pytests/unit/modules/test_transactional_update.py b/tests/pytests/unit/modules/test_transactional_update.py index 0f08e32ec59..eb6dfae2868 100644 --- a/tests/pytests/unit/modules/test_transactional_update.py +++ b/tests/pytests/unit/modules/test_transactional_update.py @@ -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",