From 77369d8164dfcd958cc2192dd8c86bfc15310cfd Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Thu, 31 Jan 2013 22:05:06 +0100
Subject: [PATCH] disable error handler while running phpunit

---
 lib/base.php        | 8 +++++---
 tests/bootstrap.php | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 90e64f13af6..b432f282aaf 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -402,9 +402,11 @@ class OC {
 
 		self::initPaths();
 
-		register_shutdown_function(array('OC_Log', 'onShutdown'));
-		set_error_handler(array('OC_Log', 'onError'));
-		set_exception_handler(array('OC_Log', 'onException'));
+		if (!defined('PHPUNIT_RUN')) {
+			register_shutdown_function(array('OC_Log', 'onShutdown'));
+			set_error_handler(array('OC_Log', 'onError'));
+			set_exception_handler(array('OC_Log', 'onException'));
+		}
 
 		// set debug mode if an xdebug session is active
 		if (!defined('DEBUG') || !DEBUG) {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index b97161ee6e4..fb667263e45 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -2,6 +2,9 @@
 
 global $RUNTIME_NOAPPS;
 $RUNTIME_NOAPPS = true;
+
+define('PHPUNIT_RUN', 1);
+
 require_once __DIR__.'/../lib/base.php';
 
 if(!class_exists('PHPUnit_Framework_TestCase')) {
-- 
2.39.5