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

Correct failure assertion

Browse source
This commit is contained in:
Joseph Hall 2023-09-14 07:49:36 -06:00 • committed by Megan Wilhite
parent caa5e39303
commit e3c428e61b
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/pytests/functional/formulas/test_nginx.py
View file

@ -12,6 +12,9 @@ def _formula(saltstack_formula):
@pytest.fixture(scope="module")
def modules(loaders, _formula):
loaders.opts["file_roots"]["base"].append(
str(_formula.state_tree_path / f"{_formula.name}-{_formula.tag}")
)
return loaders.modules
@ -19,5 +22,7 @@ def modules(loaders, _formula):
@pytest.mark.destructive_test
def test_formula(modules):
ret = modules.state.sls("nginx")
assert not ret.errors
assert not ret.failed
for staterun in ret:
assert staterun.result is True
assert staterun.result

11
tests/pytests/functional/formulas/test_users.py
View file

@ -13,6 +13,9 @@ def _formula(saltstack_formula):
@pytest.fixture(scope="module")
def modules(loaders, _formula):
loaders.opts["file_roots"]["base"].append(
str(_formula.state_tree_path / f"{_formula.name}-{_formula.tag}")
)
return loaders.modules
@ -21,10 +24,16 @@ def modules(loaders, _formula):
def test_users_formula(modules):
# sudo
ret = modules.state.sls("users.sudo")
assert not ret.errors
assert not ret.failed
for staterun in ret:
assert not staterun.result.failed
assert staterun.result
# bashrc
ret = modules.state.sls("users.bashrc")
for staterun in ret:
assert not staterun.result.failed
assert not ret.errors
assert not ret.failed
for staterun in ret:
assert staterun.result