mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-06 16:56:44 +02:00
[task/mssql-db-tests] No longer display an error when skipping db tests.
Tests are run with sqlite by default now anyway, so in the majority of cases the error message explaining how to set up database test running will not be displayed anyway. Database tests are now generally simply skipped if no configuration can be found. The RUNNING_TESTS.txt file explains how to set them up however, and more info is available on the wiki. The get_database_config method was moved from test_case_helpers to database_test_case because it has no general purpose. PHPBB3-9868
This commit is contained in:
@@ -18,74 +18,6 @@ class phpbb_test_case_helpers
|
||||
$this->test_case = $test_case;
|
||||
}
|
||||
|
||||
public function get_database_config()
|
||||
{
|
||||
static $show_error = true;
|
||||
|
||||
if (file_exists('test_config.php'))
|
||||
{
|
||||
include('test_config.php');
|
||||
|
||||
return array(
|
||||
'dbms' => $dbms,
|
||||
'dbhost' => $dbhost,
|
||||
'dbport' => $dbport,
|
||||
'dbname' => $dbname,
|
||||
'dbuser' => $dbuser,
|
||||
'dbpasswd' => $dbpasswd,
|
||||
);
|
||||
}
|
||||
else if (extension_loaded('sqlite') && version_compare(PHPUnit_Runner_Version::id(), '3.4.15', '>='))
|
||||
{
|
||||
// Silently use sqlite
|
||||
return array(
|
||||
'dbms' => 'sqlite',
|
||||
'dbhost' => 'phpbb_unit_tests.sqlite2', // filename
|
||||
'dbport' => '',
|
||||
'dbname' => '',
|
||||
'dbuser' => '',
|
||||
'dbpasswd' => '',
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($show_error)
|
||||
{
|
||||
$show_error = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->test_case->markTestSkipped('Missing test_config.php: See first error.');
|
||||
return;
|
||||
}
|
||||
|
||||
trigger_error("You have to create a test_config.php like this:
|
||||
\"<?php
|
||||
\$dbms = 'mysqli';
|
||||
\$dbhost = 'localhost';
|
||||
\$dbport = '';
|
||||
\$dbname = 'database';
|
||||
\$dbuser = 'user';
|
||||
\$dbpasswd = 'password';
|
||||
\"
|
||||
|
||||
NOTE: The database is dropped and recreated with the phpbb-db-schema! Do NOT specify a database with important data.", E_USER_ERROR);
|
||||
}
|
||||
}
|
||||
|
||||
public function new_dbal()
|
||||
{
|
||||
global $phpbb_root_path, $phpEx;
|
||||
$config = $this->get_database_config();
|
||||
|
||||
require_once '../phpBB/includes/db/' . $config['dbms'] . '.php';
|
||||
$dbal = 'dbal_' . $config['dbms'];
|
||||
$db = new $dbal();
|
||||
$db->sql_connect($config['dbhost'], $config['dbuser'], $config['dbpasswd'], $config['dbname'], $config['dbport']);
|
||||
|
||||
return $db;
|
||||
}
|
||||
|
||||
public function setExpectedTriggerError($errno, $message = '')
|
||||
{
|
||||
$exceptionName = '';
|
||||
|
Reference in New Issue
Block a user