Skip to content

Commit

Permalink
Remove test suite static pillar
Browse files Browse the repository at this point in the history
  • Loading branch information
s0undt3ch committed Dec 3, 2020
1 parent ed386e5 commit 116ab7b
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 39 deletions.
22 changes: 0 additions & 22 deletions tests/integration/files/pillar/base/generic.sls

This file was deleted.

1 change: 0 additions & 1 deletion tests/integration/files/pillar/base/ng1.sls

This file was deleted.

1 change: 0 additions & 1 deletion tests/integration/files/pillar/base/ng2.sls

This file was deleted.

1 change: 0 additions & 1 deletion tests/integration/files/pillar/base/sub.sls

This file was deleted.

10 changes: 0 additions & 10 deletions tests/integration/files/pillar/base/top.sls

This file was deleted.

25 changes: 21 additions & 4 deletions tests/pytests/integration/cli/test_salt_call.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,19 +221,36 @@ def test_42116_cli_pillar_override(salt_call_cli):


@slowTest
def test_pillar_items_masterless(salt_minion, salt_call_cli):
def test_pillar_items_masterless(
salt_minion, salt_call_cli, base_env_pillar_tree_root_dir
):
"""
Test to ensure we get expected output
from pillar.items with salt-call
"""
TOP = """
top_file = """
base:
'{}':
- generic
- basic
""".format(
salt_minion.id
)
with pytest.helpers.temp_pillar_file("top.sls", TOP):
basic_pillar_file = """
monty: python
knights:
- Lancelot
- Galahad
- Bedevere
- Robin
"""
top_tempfile = pytest.helpers.temp_file(
"top.sls", top_file, base_env_pillar_tree_root_dir
)
basic_tempfile = pytest.helpers.temp_file(
"basic.sls", basic_pillar_file, base_env_pillar_tree_root_dir
)

with top_tempfile, basic_tempfile:
ret = salt_call_cli.run("--local", "pillar.items")
assert ret.exitcode == 0
assert "knights" in ret.json
Expand Down

0 comments on commit 116ab7b

Please sign in to comment.