Browse Source

Bugfixing tests

pull/6581/head
Philipp Holzer 2 years ago
parent
commit
0f5a50b46b
No known key found for this signature in database GPG Key ID: 517BE60E2CE5C8A5
2 changed files with 9 additions and 2 deletions
  1. +1
    -1
      src/Database/DBA.php
  2. +8
    -1
      tests/DatabaseTest.php

+ 1
- 1
src/Database/DBA.php View File

@ -423,7 +423,7 @@ class DBA
$orig_sql = $sql;
if (self::$config->get('system', 'db_callstack')) {
if (self::$config->get('system', 'db_callstack') !== null) {
$sql = "/*".System::callstack()." */ ".$sql;
}


+ 8
- 1
tests/DatabaseTest.php View File

@ -5,7 +5,10 @@
namespace Friendica\Test;
use Friendica\Core\Config;
use Friendica\Database\DBA;
use Friendica\Factory;
use Friendica\Util\BasePath;
use PHPUnit\DbUnit\DataSet\YamlDataSet;
use PHPUnit\DbUnit\TestCaseTrait;
use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
@ -36,8 +39,12 @@ abstract class DatabaseTest extends MockedTest
$this->markTestSkipped('Please set the MYSQL_* environment variables to your test database credentials.');
}
$basedir = BasePath::create(dirname(__DIR__));
$configLoader = new Config\ConfigCacheLoader($basedir);
$config = Factory\ConfigFactory::createCache($configLoader);
DBA::connect(
__DIR__,
$config,
getenv('MYSQL_HOST'),
getenv('MYSQL_USERNAME'),
getenv('MYSQL_PASSWORD'),


Loading…
Cancel
Save