diff options
| author | Peter Zhang <peter@innocraft.com> | 2021-10-28 12:27:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-28 12:27:32 +0300 |
| commit | 7de92b4037ebd47772548783fc06519f080b8daa (patch) | |
| tree | ae8f85c111fff043a52932b19dd69244395f45c1 /tests/PHPUnit/Framework | |
| parent | 518fcb3daee432d6ce76ee9e5d166e7c1ce67889 (diff) | |
update database test work without section set (#18151)
* update database test
update database test
* update tests
update tests
* add matomo_tests to exception
add matomo_tests to exception
* test env on travis
test env on travis
* test database change on travis
test database change on travis
* update tests
update tests
* update test
update test
* update test database host
update test database host
* update tests
update tests
* Update bootstrap.php
update bootstrap to recreate empty test
Diffstat (limited to 'tests/PHPUnit/Framework')
| -rw-r--r-- | tests/PHPUnit/Framework/Fixture.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php index 96b2bc5282..31f3b99034 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -262,7 +262,6 @@ class Fixture extends \PHPUnit\Framework\Assert Tracker::disconnectCachedDbConnection(); // reconnect once we're sure the database exists - self::getConfig()->database['dbname'] = $this->dbName; Db::createDatabaseObject(); Db::get()->query("SET wait_timeout=28800;"); @@ -993,7 +992,7 @@ class Fixture extends \PHPUnit\Framework\Assert $config = $iniReader->readFile(PIWIK_INCLUDE_PATH . '/config/config.ini.php'); $originalDbName = $config['database']['dbname']; if ($dbName == $originalDbName - && $dbName != 'piwik_tests' + && $dbName != 'piwik_tests' && $dbName !='matomo_tests' ) { // santity check throw new \Exception("Trying to drop original database '$originalDbName'. Something's wrong w/ the tests."); } |