From 9309ae299ae94caf66187f98ad500ef6f082d762 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 5 Nov 2019 22:28:32 +0100
Subject: [PATCH] Use try/finally to ensure chmod is run, filter warning
---
testing/test_cacheprovider.py | 40 +++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/testing/test_cacheprovider.py b/testing/test_cacheprovider.py
index 6513909bc..6a5a5af8b 100644
--- a/testing/test_cacheprovider.py
+++ b/testing/test_cacheprovider.py
@@ -48,28 +48,36 @@ class TestNewAPI:
testdir.makeini("[pytest]")
mode = os.stat(testdir.tmpdir.ensure_dir(".pytest_cache"))[stat.ST_MODE]
testdir.tmpdir.ensure_dir(".pytest_cache").chmod(0)
- config = testdir.parseconfigure()
- cache = config.cache
- cache.set("test/broken", [])
- testdir.tmpdir.ensure_dir(".pytest_cache").chmod(mode)
+ try:
+ config = testdir.parseconfigure()
+ cache = config.cache
+ cache.set("test/broken", [])
+ finally:
+ testdir.tmpdir.ensure_dir(".pytest_cache").chmod(mode)
@pytest.mark.skipif(sys.platform.startswith("win"), reason="no chmod on windows")
- @pytest.mark.filterwarnings("default")
+ @pytest.mark.filterwarnings(
+ "ignore:could not create cache path:pytest.PytestWarning"
+ )
def test_cache_failure_warns(self, testdir):
mode = os.stat(testdir.tmpdir.ensure_dir(".pytest_cache"))[stat.ST_MODE]
testdir.tmpdir.ensure_dir(".pytest_cache").chmod(0)
- testdir.makepyfile(
- """
- def test_error():
- raise Exception
+ try:
+ testdir.makepyfile(
+ """
+ def test_error():
+ raise Exception
- """
- )
- result = testdir.runpytest("-rw")
- testdir.tmpdir.ensure_dir(".pytest_cache").chmod(mode)
- assert result.ret == 1
- # warnings from nodeids, lastfailed, and stepwise
- result.stdout.fnmatch_lines(["*could not create cache path*", "*3 warnings*"])
+ """
+ )
+ result = testdir.runpytest("-rw")
+ assert result.ret == 1
+ # warnings from nodeids, lastfailed, and stepwise
+ result.stdout.fnmatch_lines(
+ ["*could not create cache path*", "*3 warnings*"]
+ )
+ finally:
+ testdir.tmpdir.ensure_dir(".pytest_cache").chmod(mode)
def test_config_cache(self, testdir):
testdir.makeconftest(