safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

lonvia PR feedback

Browse Source
This commit is contained in:
marc tobias
2020-04-26 03:33:15 +02:00
parent 38c21de0ee
commit a5d0657d9b
4 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/php/Nominatim/DBTest.php
View File

@@ -128,11 +128,19 @@ class DBTest extends \PHPUnit\Framework\TestCase
public function testAgainstDatabase()
{
if (getenv('UNIT_TEST_DSN') == false) $this->markTestSkipped('UNIT_TEST_DSN not set');
$unit_test_dsn = getenv('UNIT_TEST_DSN') != false ?
getenv('UNIT_TEST_DSN') :
'pgsql:dbname=nominatim_unit_tests';
$this->assertRegExp(
'/unit_test/',
$unit_test_dsn,
'Test database will get destroyed, thus should have a name like unit_test to be safe'
);
## Create the database.
{
$aDSNParsed = \Nominatim\DB::parseDSN(getenv('UNIT_TEST_DSN'));
$aDSNParsed = \Nominatim\DB::parseDSN($unit_test_dsn);
$sDbname = $aDSNParsed['database'];
$aDSNParsed['database'] = 'postgres';
@@ -142,7 +150,7 @@ class DBTest extends \PHPUnit\Framework\TestCase
$oDB->exec('CREATE DATABASE ' . $sDbname);
}
$oDB = new \Nominatim\DB(getenv('UNIT_TEST_DSN'));
$oDB = new \Nominatim\DB($unit_test_dsn);
$oDB->connect();
$this->assertTrue(