extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 17:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Re-init VFS for each test class

Browse Source 
- Balance output buffering
This commit is contained in:
nathangray 2018-02-15 09:33:01 -07:00
parent 89a8e6f448
commit 54dcc794a2
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/tests/LoggedInTest.php
View File

@ -54,6 +54,7 @@ abstract class LoggedInTest extends TestCase
// Re-init config, since it doesn't get handled by loading Egw // Re-init config, since it doesn't get handled by loading Egw
Api\Config::init_static(); Api\Config::init_static();
Api\Vfs::init_static();
} }
catch(Exception $e) catch(Exception $e)
{ {
@ -96,6 +97,9 @@ abstract class LoggedInTest extends TestCase
} }
unset($GLOBALS['egw']); unset($GLOBALS['egw']);
} }
Api\Session::egw_setcookie('sessionid');
Api\Session::egw_setcookie('kp3');
unset($GLOBALS['egw_info']); unset($GLOBALS['egw_info']);
unset($GLOBALS['_SESSION']); unset($GLOBALS['_SESSION']);
$_SESSION = array(); $_SESSION = array();
@ -136,6 +140,7 @@ abstract class LoggedInTest extends TestCase
} }
$GLOBALS['egw_info'] = $info; $GLOBALS['egw_info'] = $info;
$ob_level = ob_get_level();
try try
{ {
include(realpath(__DIR__ . '/../../header.inc.php')); include(realpath(__DIR__ . '/../../header.inc.php'));
@ -171,6 +176,11 @@ abstract class LoggedInTest extends TestCase
// Disable asyc while we test // Disable asyc while we test
$GLOBALS['egw_info']['server']['asyncservice'] = 'off'; $GLOBALS['egw_info']['server']['asyncservice'] = 'off';
while(ob_get_level() > $ob_level)
{
ob_end_clean();
}
} }