makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14462] Fix tests

Browse source 
PHPBB3-14462
This commit is contained in:
Mate Bartus 2016-02-12 15:53:36 +01:00
parent 7c0fb563ec
commit 97d128a7e4
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/test_framework/phpbb_functional_test_case.php
View file

@ -372,11 +372,15 @@ class phpbb_functional_test_case extends phpbb_test_case
self::$install_success = true;
if (file_exists($phpbb_root_path . 'cache/install_lock') || file_exists($phpbb_root_path . 'store/install_config.php'))
if (file_exists($phpbb_root_path . 'store/install_config.php'))
{
self::$install_success = false;
unlink($phpbb_root_path . 'cache/install_lock');
unlink($phpbb_root_path . 'store/install_config.php');
@unlink($phpbb_root_path . 'store/install_config.php');
}
if (file_exists($phpbb_root_path . 'cache/install_lock'))
{
@unlink($phpbb_root_path . 'cache/install_lock');
}
global $phpbb_container, $cache, $phpbb_dispatcher, $request, $user, $auth, $db, $config, $phpbb_log, $symfony_request, $phpbb_filesystem, $phpbb_path_helper, $phpbb_extension_manager, $template;

10
tests/test_framework/phpbb_ui_test_case.php
View file

@ -223,11 +223,15 @@ class phpbb_ui_test_case extends phpbb_test_case
self::$install_success = true;
if (file_exists($phpbb_root_path . 'cache/install_lock') || file_exists($phpbb_root_path . 'store/install_config.php'))
if (file_exists($phpbb_root_path . 'store/install_config.php'))
{
self::$install_success = false;
unlink($phpbb_root_path . 'cache/install_lock');
unlink($phpbb_root_path . 'store/install_config.php');
@unlink($phpbb_root_path . 'store/install_config.php');
}
if (file_exists($phpbb_root_path . 'cache/install_lock'))
{
@unlink($phpbb_root_path . 'cache/install_lock');
}
global $phpbb_container, $cache, $phpbb_dispatcher, $request, $user, $auth, $db, $config, $phpbb_log, $symfony_request, $phpbb_filesystem, $phpbb_path_helper, $phpbb_extension_manager, $template;