disable error handler while running phpunit

diff --git a/lib/base.php b/lib/base.php
index 90e64f13af616dbc22221d445333cb74d4304dad..b432f282aafd0ae819dde64782965c81209433b8 100644 (file)
--- 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 b97161ee6e4263ff3561ee9a64d9d1896b2407dd..fb667263e45474a3dab4b0c2f26eaa4eee36f071 100644 (file)
--- 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')) {