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

The file_tree ext pillar now has a fixture for it's root path

Browse source
This commit is contained in:
Pedro Algarvio 2020-11-24 17:53:32 +00:00
parent e1a752b0ab
commit 2f7fb31195
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/conftest.py
View file

@ -693,6 +693,17 @@ def base_env_pillar_tree_root_dir(pillar_tree_root_dir):
return dirname
@pytest.fixture(scope="session")
def ext_pillar_file_tree_root_dir(pillar_tree_root_dir):
"""
Fixture which returns the salt pillar file tree directory path.
Creates the directory if it does not yet exist.
"""
dirname = pillar_tree_root_dir / "file-tree"
dirname.mkdir(exist_ok=True)
return dirname
@pytest.fixture(scope="session")
def prod_env_pillar_tree_root_dir(pillar_tree_root_dir):
"""
@ -826,6 +837,7 @@ def salt_master_factory(
base_env_pillar_tree_root_dir,
prod_env_state_tree_root_dir,
prod_env_pillar_tree_root_dir,
ext_pillar_file_tree_root_dir,
):
root_dir = salt_factories.get_root_dir_for_daemon("master")
conf_dir = root_dir / "conf"
@ -859,7 +871,7 @@ def salt_master_factory(
ext_pillar.append(
{
"file_tree": {
"root_dir": os.path.join(RUNTIME_VARS.PILLAR_DIR, "base", "file_tree"),
"root_dir": str(ext_pillar_file_tree_root_dir),
"follow_dir_links": False,
"keep_newline": True,
}

3
tests/pytests/conftest.py
View file

@ -38,6 +38,7 @@ def salt_master_factory(
base_env_pillar_tree_root_dir,
prod_env_state_tree_root_dir,
prod_env_pillar_tree_root_dir,
ext_pillar_file_tree_root_dir,
):
master_id = random_string("master-")
root_dir = salt_factories.get_root_dir_for_daemon(master_id)
@ -88,7 +89,7 @@ def salt_master_factory(
ext_pillar.append(
{
"file_tree": {
"root_dir": os.path.join(RUNTIME_VARS.PILLAR_DIR, "base", "file_tree"),
"root_dir": str(ext_pillar_file_tree_root_dir),
"follow_dir_links": False,
"keep_newline": True,
}