1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-13 20:32:11 +02:00

Merge branch '3.1.x'

* 3.1.x:
  [ticket/14394] Only purge cache in functional tests if necessary
This commit is contained in:
Mate Bartus 2016-01-08 14:28:03 +01:00
commit 2efab1cf5a
6 changed files with 23 additions and 1 deletions

View File

@ -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

View File

@ -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');

View File

@ -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);

View File

@ -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();

View File

@ -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');

View File

@ -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();