Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 7 Oct 2015 10:23:55 +0000 (12:23 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 7 Oct 2015 10:23:55 +0000 (12:23 +0200)
Conflicts:
tests/tine20/TestCase.php

Change-Id: Ib71850dd223bee807b66730e2e5166d772e4ecb5

1  2 
tests/tine20/TestCase.php
tests/tine20/Tinebase/Frontend/CliTest.php

@@@ -121,7 -128,21 +128,22 @@@ abstract class TestCase extends PHPUnit
          if ($this->_invalidateRolesCache) {
              Tinebase_Acl_Roles::getInstance()->resetClassCache();
          }
 -        Tinebase_Cache_PerRequest::getInstance()->resetCache();
++
 +        Tinebase_Cache_PerRequest::getInstance()->reset();
+         $this->_releaseDBLocks();
+     }
+     /**
+      * release db locks
+      */
+     protected function _releaseDBLocks()
+     {
+         foreach ($this->_releaseDBLockIds as $lockId) {
+             Tinebase_Lock::releaseDBSessionLock($lockId);
+         }
+         $this->_releaseDBLockIds = array();
      }
  
      /**
@@@ -220,9 -206,10 +206,10 @@@ class Tinebase_Frontend_CliTest extend
          $out = ob_get_clean();
          
          $userPlugins = Tinebase_User::getInstance()->getPlugins();
 -        $this->assertEquals(0, count($userPlugins));
 +        $this->assertEquals(0, count($userPlugins), 'got user plugins: ' . print_r($userPlugins, true));
          
          $cronuserId = Tinebase_Config::getInstance()->get(Tinebase_Config::CRONUSERID);
+         $this->assertTrue(! empty($cronuserId), 'got empty cronuser id');
          $cronuser = Tinebase_User::getInstance()->getFullUserById($cronuserId);
          $this->assertEquals('cronuser', $cronuser->accountLoginName);
          $adminGroup = Tinebase_Group::getInstance()->getDefaultAdminGroup();