From 5196ea22ffc2a39c0f3f9b41a6aa5945b63d04b2 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 1 Jul 2018 04:05:20 -0400 Subject: [PATCH] Fix Database connexion in tests --- tests/DatabaseTest.php | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php index e79e9237be..1a1b53b120 100644 --- a/tests/DatabaseTest.php +++ b/tests/DatabaseTest.php @@ -81,21 +81,8 @@ abstract class DatabaseTest extends TestCase */ protected function getConnection() { - if (!dba::$connected) { - dba::connect(getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT'), getenv('MYSQL_USERNAME'), getenv('MYSQL_PASSWORD'), getenv('MYSQL_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.'); - } + if (!dba::connected()) { + $this->markTestSkipped('Could not connect to the database.'); } return $this->createDefaultDBConnection(dba::get_db(), getenv('MYSQL_DATABASE'));