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

Merge pull request #4964 from blueyed/mkdir 

Revisit mkdir/_ensure_supporting_files in cacheprovider
This commit is contained in:
Daniel Hahler 2019-03-20 21:58:24 +01:00 committed by GitHub
parent 7939e5327c bcdbb6b677
commit 832cef953b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/_pytest/cacheprovider.py
View File

@ -121,10 +121,12 @@ class Cache(object):
cache_dir_exists_already = True cache_dir_exists_already = True
else: else:
cache_dir_exists_already = self._cachedir.exists() cache_dir_exists_already = self._cachedir.exists()
path.parent.mkdir(exist_ok=True, parents=True) path.parent.mkdir(exist_ok=True, parents=True)
except (IOError, OSError): except (IOError, OSError):
self.warn("could not create cache path {path}", path=path) self.warn("could not create cache path {path}", path=path)
return return
if not cache_dir_exists_already:
self._ensure_supporting_files()
try: try:
f = path.open("wb" if PY2 else "w") f = path.open("wb" if PY2 else "w")
except (IOError, OSError): except (IOError, OSError):
@ -133,9 +135,6 @@ class Cache(object):
with f: with f:
json.dump(value, f, indent=2, sort_keys=True) json.dump(value, f, indent=2, sort_keys=True)
if not cache_dir_exists_already:
self._ensure_supporting_files()
def _ensure_supporting_files(self): def _ensure_supporting_files(self):
"""Create supporting files in the cache dir that are not really part of the cache.""" """Create supporting files in the cache dir that are not really part of the cache."""
readme_path = self._cachedir / "README.md" readme_path = self._cachedir / "README.md"