floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

on_rm_rf_error: ignore os.open (no warning) 

Ref: https://github.com/pytest-dev/pytest/pull/6044/files#r339321752
This commit is contained in:
Daniel Hahler 2019-10-27 02:28:35 +01:00
parent 5be3a9b5ce
commit 8aa0809fbc
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/_pytest/pathlib.py
View File

@ -68,6 +68,7 @@ def on_rm_rf_error(func, path: str, exc, *, start_path: Path) -> bool:
return False return False
if func not in (os.rmdir, os.remove, os.unlink): if func not in (os.rmdir, os.remove, os.unlink):
if func not in (os.open,):
warnings.warn( warnings.warn(
PytestWarning( PytestWarning(
"(rm_rf) unknown function {} when removing {}:\n{}: {}".format( "(rm_rf) unknown function {} when removing {}:\n{}: {}".format(

7
testing/test_tmpdir.py
View File

@ -393,6 +393,13 @@ class TestRmRf:
on_rm_rf_error(None, str(fn), exc_info, start_path=tmp_path) on_rm_rf_error(None, str(fn), exc_info, start_path=tmp_path)
assert fn.is_file() assert fn.is_file()
# ignored function
with pytest.warns(None) as warninfo:
exc_info = (None, PermissionError(), None)
on_rm_rf_error(os.open, str(fn), exc_info, start_path=tmp_path)
assert fn.is_file()
assert not [x.message for x in warninfo]
exc_info = (None, PermissionError(), None) exc_info = (None, PermissionError(), None)
on_rm_rf_error(os.unlink, str(fn), exc_info, start_path=tmp_path) on_rm_rf_error(os.unlink, str(fn), exc_info, start_path=tmp_path)
assert not fn.is_file() assert not fn.is_file()