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

MINOR: Fixed bugs with test execution. (from r96829)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102404 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-04-12 03:24:29 +00:00
parent 9fc3256025
commit 9e9ec33dd3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dev/SapphireTest.php
View File

@ -338,7 +338,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
$this->originalIsRunningTest = null; $this->originalIsRunningTest = null;
// Reset mocked datetime // Reset mocked datetime
SSDatetime::clear_mock_now(); SS_Datetime::clear_mock_now();
} }
/** /**
* Clear the log of emails sent * Clear the log of emails sent
@ -551,12 +551,12 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
$dbConn = DB::getConn(); $dbConn = DB::getConn();
$dbName = $dbConn->currentDatabase(); $dbName = $dbConn->currentDatabase();
if($dbName && DB::getConn()->databaseExists($dbName)) { 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. // Todo: it would be good to remove this inappropriate coupling, somehow.
// The versioned class keeps a static cache of information about temporary tables. // The versioned class keeps a static cache of information about temporary tables.
Versioned::on_db_reset(); Versioned::on_db_reset();
// echo "Deleted temp database " . $dbConn->currentDatabase() . "\n";
$dbConn->dropDatabase();
} }
} }
} }