Handle exceptions thrown during hooks when running unit tests

diff --git a/lib/private/hook.php b/lib/private/hook.php
index 00fb4cb0ff5d87b8a490753c4255c2ef701ee61f..c4997eeceffb3967d74bdf16144e26bce85b51e8 100644 (file)
--- a/lib/private/hook.php
+++ b/lib/private/hook.php
@@ -5,6 +5,8 @@
  * slots and emitting signals.
  */
 class OC_Hook{
+       public static $thrownExceptions = [];
+
        static private $registered = array();
 
        /**
@@ -77,6 +79,7 @@ class OC_Hook{
                        try {
                                call_user_func( array( $i["class"], $i["name"] ), $params );
                        } catch (Exception $e){
+                               self::$thrownExceptions[] = $e;
                                OC_Log::write('hook',
                                        'error while running hook (' . $i["class"] . '::' . $i["name"] . '): '.$e->getMessage(),
                                        OC_Log::ERROR);

diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php
index f4bb847955967231f3df3341394e7c9737c77d7e..d532a3b01c0944be2795c0e5d159ea28f723ca76 100644 (file)
--- a/tests/lib/testcase.php
+++ b/tests/lib/testcase.php
@@ -40,6 +40,14 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
                });
        }
 
+       protected function tearDown() {
+               $hookExceptions = \OC_Hook::$thrownExceptions;
+               \OC_Hook::$thrownExceptions = [];
+               if(!empty($hookExceptions)) {
+                       throw $hookExceptions[0];
+               }
+       }
+
        /**
         * Returns a unique identifier as uniqid() is not reliable sometimes
         *