Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Sep 2015 14:05:37 +0000 (16:05 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Sep 2015 14:05:37 +0000 (16:05 +0200)
1  2 
tests/tine20/TestCase.php
tine20/Tinebase/Container.php

@@@ -118,10 -111,17 +118,20 @@@ abstract class TestCase extends PHPUnit
              Tinebase_Core::set(Tinebase_Core::USER, $this->_originalTestUser);
          }
          
 +        if ($this->_invalidateRolesCache) {
 +            Tinebase_Acl_Roles::getInstance()->resetClassCache();
 +        }
          Tinebase_Cache_PerRequest::getInstance()->resetCache();
+     }
+     /**
+      * tear down after test class
+      */
+     public static function tearDownAfterClass()
+     {
+         Tinebase_Core::getDbProfiling();
      }
      
      /**
Simple merge