Moving restore_error_handler up into TestManager and out of CakeTestS…

…uite.
cakephp · Jun 22, 2010 · 747847e · 747847e
1 parent d1a06f3
commit 747847e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cake/tests/lib/cake_test_suite.php b/cake/tests/lib/cake_test_suite.php
@@ -43,8 +43,6 @@ public function setFixtureManager(CakeFixtureManager $manager) {
  */
 	protected function setUp() {
 		parent::setUp();
-		restore_error_handler();
-		restore_error_handler();
 		if (!$this->_fixtureManager) {
 			return;
 		}

diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php
@@ -184,6 +184,9 @@ public function runGroupTest($groupTestName, $reporter, $codeCoverage = false) {
  * @return mixed Results of group test being run.
  */
 	protected function run($reporter, $codeCoverage = false) {
+		restore_error_handler();
+		restore_error_handler();
+
 		$result = new PHPUnit_Framework_TestResult;
 		$result->collectCodeCoverageInformation($codeCoverage);
 		$result->addListener($reporter);