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

Merge pull request #6010 from pytest-dev/asottile-patch-2 

Ensure .pytest_cache file has a newline at the end
This commit is contained in:
Anthony Sottile 2019-10-19 16:21:21 -07:00 committed by GitHub
parent 2e11ea6108 3a402811de
commit b88f5df4ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_pytest/cacheprovider.py
View File

@ -135,7 +135,7 @@ class Cache:
readme_path.write_text(README_CONTENT) readme_path.write_text(README_CONTENT)
gitignore_path = self._cachedir.joinpath(".gitignore") gitignore_path = self._cachedir.joinpath(".gitignore")
msg = "# Created by pytest automatically.\n*" msg = "# Created by pytest automatically.\n*\n"
gitignore_path.write_text(msg, encoding="UTF-8") gitignore_path.write_text(msg, encoding="UTF-8")
cachedir_tag_path = self._cachedir.joinpath("CACHEDIR.TAG") cachedir_tag_path = self._cachedir.joinpath("CACHEDIR.TAG")

2
testing/test_cacheprovider.py
View File

@ -1029,7 +1029,7 @@ def test_gitignore(testdir):
config = testdir.parseconfig() config = testdir.parseconfig()
cache = Cache.for_config(config) cache = Cache.for_config(config)
cache.set("foo", "bar") cache.set("foo", "bar")
msg = "# Created by pytest automatically.\n*" msg = "# Created by pytest automatically.\n*\n"
gitignore_path = cache._cachedir.joinpath(".gitignore") gitignore_path = cache._cachedir.joinpath(".gitignore")
assert gitignore_path.read_text(encoding="UTF-8") == msg assert gitignore_path.read_text(encoding="UTF-8") == msg