Merge master into features

2019-10-21 00:08:03 +02:00
parent fbb7f663be 14142b9113
commit 803cc1f294
8 changed files with 30 additions and 13 deletions
--- a/testing/test_cacheprovider.py
+++ b/testing/test_cacheprovider.py
@@ -1029,7 +1029,7 @@ def test_gitignore(testdir):
    config = testdir.parseconfig()
    cache = Cache.for_config(config)
    cache.set("foo", "bar")
-    msg = "# Created by pytest automatically.\n*"
+    msg = "# Created by pytest automatically.\n*\n"
    gitignore_path = cache._cachedir.joinpath(".gitignore")
    assert gitignore_path.read_text(encoding="UTF-8") == msg