Merge pull request #49736 from mattLLVW/fix-file-touch

Fix test opts in append, prepend states/file.py
This commit is contained in:
Nicole Thomas 2018-09-25 16:11:35 -04:00 committed by GitHub
commit 8fe8aac8f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -4921,7 +4921,9 @@ def append(name,
check_res, check_msg = _check_file(name)
if not check_res:
# Try to create the file
touch(name, makedirs=makedirs)
touch_ret = touch(name, makedirs=makedirs)
if __opts__['test']:
return touch_ret
retry_res, retry_msg = _check_file(name)
if not retry_res:
return _error(ret, check_msg)
@ -5202,7 +5204,9 @@ def prepend(name,
check_res, check_msg = _check_file(name)
if not check_res:
# Try to create the file
touch(name, makedirs=makedirs)
touch_ret = touch(name, makedirs=makedirs)
if __opts__['test']:
return touch_ret
retry_res, retry_msg = _check_file(name)
if not retry_res:
return _error(ret, check_msg)