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 4

Make fixtures clean up even if the test fails

Browse source
This commit is contained in:
Shane Lee 2024-03-27 12:23:53 -06:00 • committed by Daniel Wozniak
parent dd2de01d70
commit 5b6fbe1497
2 changed files with 59 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tests/pytests/functional/modules/test_chocolatey.py
View file

@ -3,7 +3,7 @@ import pytest
from salt.exceptions import CommandExecutionError
pytestmark = [
pytest.mark.destructive,
pytest.mark.destructive_test,
pytest.mark.skip_unless_on_windows,
pytest.mark.slow_test,
pytest.mark.windows_whitelisted,
@ -17,14 +17,32 @@ def chocolatey(modules):
@pytest.fixture()
def clean(chocolatey):
chocolatey.unbootstrap()
try:
# If chocolatey is not installed, this will throw an error
chocolatey.chocolatey_version(refresh=True)
# If we get this far, chocolatey is installed... let's uninstall
chocolatey.unbootstrap()
except CommandExecutionError:
pass
# Try to get the new version, should throw an error
try:
chocolatey_version = chocolatey.chocolatey_version(refresh=True)
except CommandExecutionError:
chocolatey_version = None
# Assert the chocolatey is not installed
assert chocolatey_version is None
yield
chocolatey.unbootstrap()
try:
yield
finally:
try:
# If chocolatey is not installed, this will throw an error
chocolatey.chocolatey_version(refresh=True)
# If we get this far, chocolatey is installed... let's uninstall
chocolatey.unbootstrap()
except CommandExecutionError:
pass
def test_bootstrap(chocolatey, clean):

43
tests/pytests/functional/states/chocolatey/test_bootstrap.py
View file

@ -1,3 +1,5 @@
import logging
import pytest
from salt.exceptions import CommandExecutionError
@ -9,6 +11,8 @@ pytestmark = [
pytest.mark.windows_whitelisted,
]
log = logging.getLogger(__name__)
@pytest.fixture(scope="module")
def chocolatey(states):
@ -22,26 +26,53 @@ def chocolatey_mod(modules):
@pytest.fixture()
def clean(chocolatey_mod):
chocolatey_mod.unbootstrap()
try:
# If chocolatey is not installed, this will throw an error
chocolatey_mod.chocolatey_version(refresh=True)
# If we get this far, chocolatey is installed... let's uninstall
chocolatey_mod.unbootstrap()
except CommandExecutionError:
pass
# Try to get the new version, should throw an error
try:
chocolatey_version = chocolatey_mod.chocolatey_version(refresh=True)
except CommandExecutionError:
chocolatey_version = None
# Assert the chocolatey is not installed
assert chocolatey_version is None
yield
chocolatey_mod.unbootstrap()
try:
yield
finally:
try:
# If chocolatey is not installed, this will throw an error
chocolatey_mod.chocolatey_version(refresh=True)
# If we get this far, chocolatey is installed... let's uninstall
chocolatey_mod.unbootstrap()
except CommandExecutionError:
pass
@pytest.fixture()
def installed(chocolatey_mod):
chocolatey_mod.bootstrap(force=True)
result = chocolatey_mod.bootstrap(force=True)
log.debug("CHOCO: chocolatey install output\n%s", result)
try:
chocolatey_version = chocolatey_mod.chocolatey_version(refresh=True)
except CommandExecutionError:
chocolatey_version = None
assert chocolatey_version is not None
yield
chocolatey_mod.unbootstrap()
try:
yield
finally:
try:
# If chocolatey is not installed, this will throw an error
chocolatey_mod.chocolatey_version(refresh=True)
# If we get this far, chocolatey is installed... let's uninstall
chocolatey_mod.unbootstrap()
except CommandExecutionError:
pass
def test_bootstrapped(chocolatey, chocolatey_mod, clean):