diff options
Diffstat (limited to 'tests/test_framework/phpbb_ui_test_case.php')
| -rw-r--r-- | tests/test_framework/phpbb_ui_test_case.php | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/tests/test_framework/phpbb_ui_test_case.php b/tests/test_framework/phpbb_ui_test_case.php index e118801972..59f3bdf242 100644 --- a/tests/test_framework/phpbb_ui_test_case.php +++ b/tests/test_framework/phpbb_ui_test_case.php @@ -26,6 +26,7 @@ class phpbb_ui_test_case extends phpbb_test_case static protected $config; static protected $root_url; static protected $already_installed = false; + static protected $install_success = false; static public function setUpBeforeClass() { @@ -74,6 +75,14 @@ class phpbb_ui_test_case extends phpbb_test_case } } + public function setUp() + { + if (!self::$install_success) + { + $this->fail('Installing phpBB has failed.'); + } + } + static public function visit($path) { self::$webDriver->get(self::$root_url . $path); @@ -194,17 +203,17 @@ class phpbb_ui_test_case extends phpbb_test_case $iohandler->set_input('script_path', $parseURL['path']); $iohandler->set_input('submit_server', 'submit'); - do - { - $installer->run(); - } - while (file_exists($phpbb_root_path . 'store/install_config.php')); + $installer->run(); copy($config_file, $config_file_test); - if (file_exists($phpbb_root_path . 'cache/install_lock')) + self::$install_success = true; + + if (file_exists($phpbb_root_path . 'cache/install_lock') || 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'); } global $phpbb_container, $cache, $phpbb_dispatcher, $request, $user, $auth, $db, $config, $phpbb_log, $symfony_request, $phpbb_filesystem, $phpbb_path_helper, $phpbb_extension_manager, $template; |