From 9e9ec33dd394764483681342d2f6faf32f848df7 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 12 Apr 2010 03:24:29 +0000 Subject: [PATCH] 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 --- dev/SapphireTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/SapphireTest.php b/dev/SapphireTest.php index 6a499f8fa..1067226ea 100755 --- a/dev/SapphireTest.php +++ b/dev/SapphireTest.php @@ -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(); } } }