mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
a210dbc25f
* add file.rmdir tests for original function
* update file.rmdir exec module for recursive operation and verbose output
* fixes saltstack/salt#62178 add file.rmdir state
* add older_than capability to file.rmdir exec and state modules
* change test to use direct import of file module
* Revert "change test to use direct import of file module"
This reverts commit ff8c666e3b.
* revert previous test modification and add import to win_file
* rename file.rmdir state to file.pruned
82 lines
2.4 KiB
Python
82 lines
2.4 KiB
Python
import pytest
|
|
|
|
pytestmark = [
|
|
pytest.mark.windows_whitelisted,
|
|
]
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def file(states):
|
|
return states.file
|
|
|
|
|
|
@pytest.fixture(scope="function")
|
|
def single_dir_with_file(tmp_path):
|
|
file = tmp_path / "stuff.txt"
|
|
file.write_text("things")
|
|
yield str(tmp_path)
|
|
|
|
|
|
@pytest.fixture(scope="function")
|
|
def nested_empty_dirs(tmp_path):
|
|
num_root = 2
|
|
num_mid = 4
|
|
num_last = 2
|
|
for root in range(1, num_root + 1):
|
|
for mid in range(1, num_mid + 1):
|
|
for last in range(1, num_last + 1):
|
|
nest = (
|
|
tmp_path
|
|
/ "root{}".format(root)
|
|
/ "mid{}".format(mid)
|
|
/ "last{}".format(last)
|
|
)
|
|
nest.mkdir(parents=True, exist_ok=True)
|
|
yield str(tmp_path)
|
|
|
|
|
|
@pytest.fixture(scope="function")
|
|
def nested_dirs_with_files(tmp_path):
|
|
num_root = 2
|
|
num_mid = 4
|
|
num_last = 2
|
|
for root in range(1, num_root + 1):
|
|
for mid in range(1, num_mid + 1):
|
|
for last in range(1, num_last + 1):
|
|
nest = (
|
|
tmp_path
|
|
/ "root{}".format(root)
|
|
/ "mid{}".format(mid)
|
|
/ "last{}".format(last)
|
|
)
|
|
nest.mkdir(parents=True, exist_ok=True)
|
|
if last % 2:
|
|
last_file = nest / "stuff.txt"
|
|
last_file.write_text("things")
|
|
yield str(tmp_path)
|
|
|
|
|
|
def test_pruned_failure(file, single_dir_with_file):
|
|
ret = file.pruned(name=single_dir_with_file)
|
|
assert ret.result is False
|
|
assert not ret.changes["deleted"]
|
|
assert len(ret.changes["errors"]) == 1
|
|
assert ret.comment == "Failed to remove directory {}".format(single_dir_with_file)
|
|
|
|
|
|
def test_pruned_success_recurse_and_deleted(file, nested_empty_dirs):
|
|
ret = file.pruned(name=nested_empty_dirs, recurse=True)
|
|
assert ret.result is True
|
|
assert len(ret.changes["deleted"]) == 27
|
|
assert ret.comment == "Recursively removed empty directories under {}".format(
|
|
nested_empty_dirs
|
|
)
|
|
|
|
|
|
def test_pruned_success_ignore_errors_and_deleted(file, nested_dirs_with_files):
|
|
ret = file.pruned(name=nested_dirs_with_files, ignore_errors=True)
|
|
assert ret.result is True
|
|
assert len(ret.changes["deleted"]) == 8
|
|
assert ret.comment == "Recursively removed empty directories under {}".format(
|
|
nested_dirs_with_files
|
|
)
|