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

Fix failing py3 tests

Browse source 
This should fix the following integration tests
integration.states.test_file.FileTest.test_directory_clean_require_in
integration.states.test_file.FileTest.test_directory_clean_require_in_with_id
integration.states.test_file.FileTest.test_directory_clean_require_with_name
integration.states.test_file.FileTest.test_recurse_clean
integration.states.test_file.FileTest.test_recurse_clean_specific_env
This commit is contained in:
twangboy 2019-02-22 11:42:30 -07:00
parent 64f45f8650
commit 4c55040ecf
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/states/file.py
View file

@ -644,6 +644,7 @@ def _clean_dir(root, keep, exclude_pat):
Clean out all of the files and directories in a directory (root) while
preserving the files in a list (keep) and part of exclude_pat
'''
root = os.path.normcase(root)
real_keep = _find_keep_files(root, keep)
removed = set()