From 1d9596025e53a33763d9dbb61e7dda015ec60b25 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Mon, 23 Jun 2014 14:05:57 +0200
Subject: [PATCH] Ensured cache tests do not leak temp dirs

Refs #17215.
---
 tests/cache/tests.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/cache/tests.py b/tests/cache/tests.py
index d4255e5fa0..4677791fcd 100644
--- a/tests/cache/tests.py
+++ b/tests/cache/tests.py
@@ -1151,8 +1151,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')