tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7170 from robbieaverill/pulls/4.0/ignore-exceptions-on-killing-testdb

Browse Source 
FIX Ignore exceptions thrown when deleting test databases
This commit is contained in:
Daniel Hensby 2017-07-14 14:53:51 +01:00 committed by GitHub
commit be0e16d648
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ORM/Connect/TempDatabase.php
View File

@ -2,6 +2,7 @@
namespace SilverStripe\ORM\Connect;
use Exception;
use SilverStripe\Core\ClassInfo;
use SilverStripe\Core\Injector\Injectable;
use SilverStripe\Core\Injector\Injector;
@ -92,7 +93,6 @@ class TempDatabase
}
}
// echo "Deleted temp database " . $dbConn->currentDatabase() . "\n";
$dbConn->dropSelectedDatabase();
}
@ -147,7 +147,11 @@ class TempDatabase
// Ensure test db is killed on exit
register_shutdown_function(function () {
$this->kill();
try {
$this->kill();
} catch (Exception $ex) {
// An exception thrown while trying to remove a test database shouldn't fail a build, ignore
}
});
return $dbname;