Merge branch '3.1.x'

* 3.1.x:
  [ticket/14394] Only purge cache in functional tests if necessary

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/functional/metadata_manager_test.php b/tests/functional/metadata_manager_test.php
index 080822d249..0d2fdf082e 100644
--- a/tests/functional/metadata_manager_test.php
+++ b/tests/functional/metadata_manager_test.php
@@ -24,6 +24,13 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
 		'foo/bar/',
 	);
 
+	public function tearDown()
+	{
+		$this->purge_cache();
+
+		parent::tearDown();
+	}
+
 	static public function setUpBeforeClass()
 	{
 		parent::setUpBeforeClass();