mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Run cleanup even on failure
This commit is contained in:
parent
497b84bb67
commit
aafb2fac46
1 changed files with 8 additions and 4 deletions
|
@ -54,8 +54,10 @@ def clean_comp():
|
|||
os.getenv("SystemRoot"), "System32", "GroupPolicy", "Machine", "Registry.pol"
|
||||
)
|
||||
reg_pol.unlink(missing_ok=True)
|
||||
yield reg_pol
|
||||
reg_pol.unlink(missing_ok=True)
|
||||
try:
|
||||
yield reg_pol
|
||||
finally:
|
||||
reg_pol.unlink(missing_ok=True)
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
|
@ -68,8 +70,10 @@ def checkbox_policy():
|
|||
"Server port": 1273,
|
||||
}
|
||||
win_lgpo.set_computer_policy(name=policy_name, setting=copy.copy(policy_settings))
|
||||
yield policy_name, policy_settings
|
||||
win_lgpo.set_computer_policy(name=policy_name, setting="Not Configured")
|
||||
try:
|
||||
yield policy_name, policy_settings
|
||||
finally:
|
||||
win_lgpo.set_computer_policy(name=policy_name, setting="Not Configured")
|
||||
|
||||
|
||||
def test_name(osrelease):
|
||||
|
|
Loading…
Add table
Reference in a new issue