mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
MINOR: Fixed bugs with test execution. (from r96829)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102404 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
9fc3256025
commit
9e9ec33dd3
@ -338,7 +338,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
|
||||
$this->originalIsRunningTest = null;
|
||||
|
||||
// Reset mocked datetime
|
||||
SSDatetime::clear_mock_now();
|
||||
SS_Datetime::clear_mock_now();
|
||||
}
|
||||
/**
|
||||
* Clear the log of emails sent
|
||||
@ -551,12 +551,12 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
|
||||
$dbConn = DB::getConn();
|
||||
$dbName = $dbConn->currentDatabase();
|
||||
if($dbName && DB::getConn()->databaseExists($dbName)) {
|
||||
// echo "Deleted temp database " . $dbConn->currentDatabase() . "\n";
|
||||
$dbConn->dropDatabase();
|
||||
|
||||
// Todo: it would be good to remove this inappropriate coupling, somehow.
|
||||
// The versioned class keeps a static cache of information about temporary tables.
|
||||
Versioned::on_db_reset();
|
||||
|
||||
// echo "Deleted temp database " . $dbConn->currentDatabase() . "\n";
|
||||
$dbConn->dropDatabase();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user