Merge branch '3.1.x'

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

6 files changed, 23 insertions, 1 deletions

diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index 7be8957ec7..8a71a5ce04 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -41,6 +41,8 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 	{
 		parent::setUp();
 
+		$this->purge_cache();
+
 		$this->get_db();
 
 		// Clear the phpbb_ext table
diff --git a/tests/functional/extension_global_lang_test.php b/tests/functional/extension_global_lang_test.php
index 53bb9af5ca..f615114c08 100644
--- a/tests/functional/extension_global_lang_test.php
+++ b/tests/functional/extension_global_lang_test.php
@@ -52,6 +52,13 @@ class phpbb_functional_extension_global_lang_test extends phpbb_functional_test_
 		$this->purge_cache();
 	}
 
+	public function tearDown()
+	{
+		parent::tearDown();
+
+		$this->purge_cache();
+	}
+
 	public function test_load_extension_lang_globally()
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php
index 16afced238..dad5ca7e1a 100644
--- a/tests/functional/feed_test.php
+++ b/tests/functional/feed_test.php
@@ -22,6 +22,12 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
 
 	static public $init_values = array();
 
+	public function setUp()
+	{
+		parent::setUp();
+		$this->purge_cache();
+	}
+
 	public function __construct($name = null, array $data = array(), $dataName = '')
 	{
 		parent::__construct($name, $data, $dataName);
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();
diff --git a/tests/functional/plupload_test.php b/tests/functional/plupload_test.php
index ee71597ffc..d358681ad1 100644
--- a/tests/functional/plupload_test.php
+++ b/tests/functional/plupload_test.php
@@ -33,6 +33,7 @@ class phpbb_functional_plupload_test extends phpbb_functional_test_case
 	public function setUp()
 	{
 		parent::setUp();
+		$this->purge_cache();
 		$this->set_extension_group_permission(1);
 		$this->path = __DIR__ . '/fixtures/files/';
 		$this->add_lang('posting');
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 323d97ff42..b91894f9c0 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -89,7 +89,6 @@ class phpbb_functional_test_case extends phpbb_test_case
 		// that were added in other tests are gone
 		$this->lang = array();
 		$this->add_lang('common');
-		$this->purge_cache();
 
 		$db = $this->get_db();