bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Use MYSQL_* environment variables for tests

Browse source 
- Prevent `.htconfig.php` override when present during tests.
This commit is contained in:
Hypolite Petovan 2018-07-03 08:26:44 -04:00
commit eaa3e4d157
3 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/DatabaseTest.php
View file

@ -33,15 +33,13 @@ abstract class DatabaseTest extends TestCase
$base_config_file_path = stream_resolve_include_path($base_config_file_name);
$config_file_path = dirname($base_config_file_path) . DIRECTORY_SEPARATOR . $config_file_name;
$config_string = file_get_contents($base_config_file_path);
if (!file_exists($config_file_path)) {
$config_string = file_get_contents($base_config_file_path);
$config_string = str_replace('die(', '// die(', $config_string);
$config_string = str_replace('your.mysqlhost.com', 'localhost', $config_string);
$config_string = str_replace('mysqlusername' , getenv('USER'), $config_string);
$config_string = str_replace('mysqlpassword' , getenv('PASS'), $config_string);
$config_string = str_replace('mysqldatabasename' , getenv('DB'), $config_string);
$config_string = str_replace('die(', '// die(', $config_string);
file_put_contents($config_file_path, $config_string);
file_put_contents($config_file_path, $config_string);
}
}
/**
@ -58,7 +56,7 @@ abstract class DatabaseTest extends TestCase
protected function getConnection()
{
if (!dba::$connected) {
dba::connect('localhost', getenv('USER'), getenv('PASS'), getenv('DB'));
dba::connect(getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT'), getenv('MYSQL_USERNAME'), getenv('MYSQL_PASSWORD'), getenv('MYSQL_DATABASE'));
if (dba::$connected) {
$app = get_app();