diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php index 8a9c431ca5555c4863e1eed58fe6fe1057f0fd07..89cafe1dddac1ee1b2c8b5f130f4a5d614f27457 100755 --- a/tests/PHPUnit/IntegrationTestCase.php +++ b/tests/PHPUnit/IntegrationTestCase.php @@ -132,7 +132,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase } Piwik::createDatabase($dbName); Piwik::disconnectDatabase(); -throw new Exception("DB NAME IS: $dbName"); + // reconnect once we're sure the database exists Piwik_Config::getInstance()->database['dbname'] = $dbName; Piwik::createDatabaseObject(); diff --git a/tests/PHPUnit/config.ini.travis.php b/tests/PHPUnit/config.ini.travis.php index 54530281bdb5148bf70af605d6fd9adfdfdb9177..07545c6b022ca120db4c0d4b655a45832bcfacaf 100644 --- a/tests/PHPUnit/config.ini.travis.php +++ b/tests/PHPUnit/config.ini.travis.php @@ -11,7 +11,7 @@ email = hello@example.org host = localhost username = root password = -dbname = piwik_test +dbname = piwik_tests adapter = PDO_MYSQL ; PDO_MYSQL, MYSQLI, or PDO_PGSQL tables_prefix = piwik_ ;charset = utf8