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 2

Adding a check to skip mac_assistive tests if the osa_script is unable to be installed.

Browse source
This commit is contained in:
Gareth J. Greenaway 2023-11-22 16:12:34 -08:00 • committed by Daniel Wozniak
parent fcca388664
commit e19400c36b
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/pytests/functional/modules/test_mac_assistive.py
View file

@ -4,6 +4,8 @@
import pytest
from salt.exceptions import CommandExecutionError
pytestmark = [
pytest.mark.destructive_test,
pytest.mark.skip_if_not_root,
@ -23,7 +25,11 @@ def osa_script():
@pytest.fixture(scope="function", autouse=True)
def _setup_teardown_vars(assistive, osa_script):
assistive.install(osa_script, True)
try:
ret = assistive.install(osa_script, True)
except CommandExecutionError as exc:
pytest.skip(f"Unable to install {osa_script} - {str(exc.value)}")
try:
yield
finally: