Got tests to pass when running all Core tests.

2 files changed, 25 insertions, 11 deletions

diff --git a/core/Error.php b/core/Error.php
index 475283c231..abf1aee9b0 100644
--- a/core/Error.php
+++ b/core/Error.php
@@ -21,6 +21,11 @@ class Error
     /**
      * TODO
      */
+    public static $debugBacktraceForTests = null;
+
+    /**
+     * TODO
+     */
     public $errno;
 
     /**
@@ -154,17 +159,21 @@ class Error
         }
 
         $backtrace = '';
-        $bt = @debug_backtrace();
-        if ($bt !== null && isset($bt[0])) {
-            foreach ($bt as $i => $debug) {
-                $backtrace .= "#$i  "
-                    . (isset($debug['class']) ? $debug['class'] : '')
-                    . (isset($debug['type']) ? $debug['type'] : '')
-                    . (isset($debug['function']) ? $debug['function'] : '')
-                    . '(...) called at ['
-                    . (isset($debug['file']) ? $debug['file'] : '') . ':'
-                    . (isset($debug['line']) ? $debug['line'] : '') . ']' . "\n";
+        if (empty(self::$debugBacktraceForTests)) {
+            $bt = @debug_backtrace();
+            if ($bt !== null && isset($bt[0])) {
+                foreach ($bt as $i => $debug) {
+                    $backtrace .= "#$i  "
+                        . (isset($debug['class']) ? $debug['class'] : '')
+                        . (isset($debug['type']) ? $debug['type'] : '')
+                        . (isset($debug['function']) ? $debug['function'] : '')
+                        . '(...) called at ['
+                        . (isset($debug['file']) ? $debug['file'] : '') . ':'
+                        . (isset($debug['line']) ? $debug['line'] : '') . ']' . "\n";
+                }
             }
+        } else {
+            $backtrace = self::$debugBacktraceForTests;
         }
 
         $error = new Error($errno, $errstr, $errfile, $errline, $backtrace);
diff --git a/core/ExceptionHandler.php b/core/ExceptionHandler.php
index cc25f3b989..47cfa12634 100644
--- a/core/ExceptionHandler.php
+++ b/core/ExceptionHandler.php
@@ -22,6 +22,11 @@ use Piwik\API\ResponseBuilder;
  */
 class ExceptionHandler
 {
+    /**
+     * TODO
+     */
+    public static $debugBacktraceForTests = null;
+
     public static function setUp()
     {
         Piwik_AddAction('Log.formatFileMessage', array('\\Piwik\\ExceptionHandler', 'formatFileAndDBLogMessage'));
@@ -35,7 +40,7 @@ class ExceptionHandler
     {
         if ($message instanceof \Exception) {
             $message = sprintf("%s(%d): %s\n%s", $message->getFile(), $message->getLine(), $message->getMessage(),
-                $message->getTraceAsString());
+                self::$debugBacktraceForTests ?: $message->getTraceAsString());
 
             $message = $log->formatMessage($level, $pluginName, $datetime, $message);
         }