strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix Database connexion in tests

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-01 04:05:20 -04:00
parent 7f04a2ab8b
commit 5196ea22ff
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tests/DatabaseTest.php
View file

@ -81,21 +81,8 @@ abstract class DatabaseTest extends TestCase
*/ */
protected function getConnection() protected function getConnection()
{ {
if (!dba::$connected) { if (!dba::connected()) {
dba::connect(getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT'), getenv('MYSQL_USERNAME'), getenv('MYSQL_PASSWORD'), getenv('MYSQL_DATABASE')); $this->markTestSkipped('Could not connect to the database.');
if (dba::$connected) {
$app = get_app();
// We need to do this in order to disable logging
$app->mode = \Friendica\App::MODE_INSTALL;
// Create database structure
DBStructure::update(false, true, true);
$app->mode = \Friendica\App::MODE_NORMAL;
} else {
$this->markTestSkipped('Could not connect to the database. Please check the MYSQL_* environment variables.');
}
} }
return $this->createDefaultDBConnection(dba::get_db(), getenv('MYSQL_DATABASE')); return $this->createDefaultDBConnection(dba::get_db(), getenv('MYSQL_DATABASE'));