From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Thu, 31 Jan 2013 21:05:06 +0000 (+0100)
Subject: disable error handler while running phpunit
X-Git-Tag: v5.0.0alpha1~110^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=77369d8164dfcd958cc2192dd8c86bfc15310cfd;p=nextcloud-server.git

disable error handler while running phpunit
---

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')) {