summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2014-06-23 14:05:57 +0200
committerClaude Paroz <claude@2xlibre.net>2014-06-23 14:17:32 +0200
commit6015083e9d156e30c8cd5e200317f4c0f10f4abf (patch)
tree174f1b158aace6854769c7bd0a96ac02540c74b0
parenta90f0e605e9a7c1b30ccdca222ee2a0e7a78043b (diff)
[1.7.x] Ensured cache tests do not leak temp dirs
Refs #17215. Backport of 1d9596025e from master.
-rw-r--r--tests/cache/tests.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/cache/tests.py b/tests/cache/tests.py
index 8a35fb461a..2c541a304d 100644
--- a/tests/cache/tests.py
+++ b/tests/cache/tests.py
@@ -1149,8 +1149,9 @@ class FileBasedCacheTests(BaseCacheTests, TestCase):
cache_params.update({'LOCATION': self.dirname})
def tearDown(self):
- shutil.rmtree(self.dirname)
super(FileBasedCacheTests, self).tearDown()
+ # Call parent first, as cache.clear() may recreate cache base directory
+ shutil.rmtree(self.dirname)
def test_ignores_non_cache_files(self):
fname = os.path.join(self.dirname, 'not-a-cache-file')